ci: migrate to docker compose v2 syntax

alterway · Oct 1, 2024 · f06b2eb · f06b2eb
1 parent d708913
commit f06b2eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   sshportal:
     build: