CI: Update to Docker Compose V2

Apparently, GHA phased out the Docker Compose v1 CLI.
daq-tools · Aug 5, 2024 · bb7804a · bb7804a
1 parent 17d5c4e
commit bb7804a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/oci-full.yml b/.github/workflows/oci-full.yml
@@ -56,8 +56,8 @@ jobs:
           if [[ -f release/oci/full.test.yml ]]; then
             export DOCKER_BUILDKIT=1
             export COMPOSE_DOCKER_CLI_BUILD=1
-            docker-compose --file release/oci/full.test.yml build
-            docker-compose --file release/oci/full.test.yml run sut
+            docker compose --file release/oci/full.test.yml build
+            docker compose --file release/oci/full.test.yml run sut
           fi
 
   oci:

diff --git a/.github/workflows/oci-standard.yml b/.github/workflows/oci-standard.yml
@@ -56,8 +56,8 @@ jobs:
           if [[ -f release/oci/standard.test.yml ]]; then
             export DOCKER_BUILDKIT=1
             export COMPOSE_DOCKER_CLI_BUILD=1
-            docker-compose --file release/oci/standard.test.yml build
-            docker-compose --file release/oci/standard.test.yml run sut
+            docker compose --file release/oci/standard.test.yml build
+            docker compose --file release/oci/standard.test.yml run sut
           fi
 
   oci:

diff --git a/release/oci/full.test.yml b/release/oci/full.test.yml
@@ -1,4 +1,6 @@
-sut:
-  build: ../..
-  dockerfile: release/oci/full.Dockerfile
-  command: selftest.sh full
+services:
+  sut:
+    build:
+      context: ../..
+      dockerfile: release/oci/full.Dockerfile
+    command: selftest.sh full
diff --git a/release/oci/standard.test.yml b/release/oci/standard.test.yml
@@ -1,4 +1,6 @@
-sut:
-  build: ../..
-  dockerfile: release/oci/standard.Dockerfile
-  command: selftest.sh standard
+services:
+  sut:
+    build:
+      context: ../..
+      dockerfile: release/oci/standard.Dockerfile
+    command: selftest.sh standard