From f7b07591fa1904525da0162ca56e1d047baddbbe Mon Sep 17 00:00:00 2001
From: Richard Kettelerij <richard@mindloops.nl>
Date: Thu, 8 Aug 2024 08:39:16 +0200
Subject: [PATCH] fix(e2e): Switch from Docker Compose v1 to V2 due to
 https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/

---
 .github/workflows/e2e-test.yml              | 13 +++++--------
 Dockerfile                                  |  3 ++-
 examples/docker-compose-features-azure.yaml |  3 ---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 2d4b1bdd..5c2bf416 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -8,26 +8,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # Build a local test image for re-use across end-to-end tests
+      # Build a local test image for (potential) re-use across end-to-end tests
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           driver: docker
-      - name: Verify Docker install
-        run: docker compose --version
       - name: Build test image
         uses: docker/build-push-action@v5
         with:
           push: false
           tags: gokoala:local
 
-      # E2E Test
+      # E2E Test (Docker Compose V2 can't re-use image, so build it but skip unit tests).
       - name: E2E Test => OGC API Features with Azure GeoPackage
         run: |
-          docker compose --compatibility -f ./examples/docker-compose-features-azure.yaml pull \
-          && \
-          docker compose --compatibility -f ./examples/docker-compose-features-azure.yaml up \
-            --no-build --exit-code-from smoketest
+          docker compose build --build-arg="TEST_CMD=;" gokoala && \
+          docker compose -f ./examples/docker-compose-features-azure.yaml up \
+            --exit-code-from smoketest
 
       - name: Start GoKoala test instance
         run: |
diff --git a/Dockerfile b/Dockerfile
index cf8c0250..80bb9bf8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ RUN npm run build
 FROM docker.io/golang:1.22-bookworm AS build-env
 WORKDIR /go/src/service
 ADD . /go/src/service
+ARG TEST_CMD="go test -short ./..."
 
 # enable cgo in order to interface with sqlite
 ENV CGO_ENABLED=1
@@ -27,7 +28,7 @@ RUN hack/build-controller-gen.sh
 # build & test the binary with debug information removed.
 RUN go mod download all && \
     go generate -v ./... && \
-    go test -short ./... && \
+    ${TEST_CMD} && \
     go build -v -ldflags '-w -s' -a -installsuffix cgo -o /gokoala github.com/PDOK/gokoala/cmd
 
 # delete all go files (and testdata dirs) so only assets/templates/etc remain, since in a later
diff --git a/examples/docker-compose-features-azure.yaml b/examples/docker-compose-features-azure.yaml
index 64c0f531..f5baa959 100644
--- a/examples/docker-compose-features-azure.yaml
+++ b/examples/docker-compose-features-azure.yaml
@@ -1,6 +1,4 @@
 ---
-version: "3"
-
 services:
   azurite:
     image: mcr.microsoft.com/azure-storage/azurite:3.29.0
@@ -42,7 +40,6 @@ services:
       retries: 30
 
   gokoala:
-    image: gokoala:local  # run local image if available (used in CI)
     build:
       context: ../
       dockerfile: Dockerfile