From f06b2ebcccc5da86080b4dbb8a342613825c2563 Mon Sep 17 00:00:00 2001 From: libvoid <135131094+libvoid@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:59:26 +0200 Subject: [PATCH] ci: migrate to docker compose v2 syntax --- Dockerfile | 2 +- examples/integration/Makefile | 14 +++++++------- examples/integration/docker-compose.yml | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4719588c..112c2b81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build -FROM golang:1.23 as builder +FROM docker.io/golang:1.23 as builder WORKDIR /go/src/sshportal COPY . ./ RUN go build -ldflags="-X main.GitSha=$(git rev-parse --short HEAD) -X main.GitTag=$(git describe --tags --always) -extldflags '-static' -w -s" -tags osusergo,netgo,sqlite_omit_load_extension -v -o /go/bin/sshportal diff --git a/examples/integration/Makefile b/examples/integration/Makefile index e3e2af33..6f40bc7a 100644 --- a/examples/integration/Makefile +++ b/examples/integration/Makefile @@ -1,10 +1,10 @@ run: - docker-compose down - docker-compose up -d sshportal - docker-compose build client - docker-compose exec -T sshportal /bin/sshportal healthcheck --wait --quiet - docker-compose run client /integration/_client.sh - docker-compose down + docker compose down + docker compose up -d sshportal + docker compose build client + docker compose exec -T sshportal /bin/sshportal healthcheck --wait --quiet + docker compose run client /integration/_client.sh + docker compose down build: - docker-compose build + docker compose build diff --git a/examples/integration/docker-compose.yml b/examples/integration/docker-compose.yml index 37a26538..3ca8c31d 100644 --- a/examples/integration/docker-compose.yml +++ b/examples/integration/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: sshportal: build: