From 27500028ed31723c2b92519c69bf8f85e96d432d Mon Sep 17 00:00:00 2001
From: Bastian Krause <bst@pengutronix.de>
Date: Thu, 1 Aug 2024 17:27:48 +0200
Subject: [PATCH] docker: migrate to Docker compose v2

Docker compose v1 has been deprecated since July 2023 [1]. Now the
GitHub actions Ubuntu runner images removed it, too [2]. So move to v2.

labgrid is obviously not affected by any changes between v1 and v2 other
than the compose call docker-compose -> docker compose.

[1] https://docs.docker.com/compose/migrate/
[2] https://github.com/actions/runner-images/issues/9692

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 .github/workflows/docker.yml                     | 4 ++--
 .github/workflows/reusable-unit-tests-docker.yml | 4 ++--
 dockerfiles/README.rst                           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bd111b4eb..71fafa366 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,8 +38,8 @@ jobs:
     - name: Build amd64 docker image and validate
       run: |
         ./dockerfiles/build.sh --load
-        docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client
-        docker-compose -f dockerfiles/staging/docker-compose.yml down
+        docker compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client
+        docker compose -f dockerfiles/staging/docker-compose.yml down
         docker images
     - name: Build, tag and push latest image for all platforms
       run: ./dockerfiles/build.sh --platform ${IMAGE_PLATFORMS} --push
diff --git a/.github/workflows/reusable-unit-tests-docker.yml b/.github/workflows/reusable-unit-tests-docker.yml
index dc1b58a2d..986d47161 100644
--- a/.github/workflows/reusable-unit-tests-docker.yml
+++ b/.github/workflows/reusable-unit-tests-docker.yml
@@ -22,8 +22,8 @@ jobs:
     - name: Build docker images
       run: |
         ./dockerfiles/build.sh
-        docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client || (docker-compose -f dockerfiles/staging/docker-compose.yml logs --timestamps && false)
-        docker-compose -f dockerfiles/staging/docker-compose.yml down
+        docker compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client || (docker compose -f dockerfiles/staging/docker-compose.yml logs --timestamps && false)
+        docker compose -f dockerfiles/staging/docker-compose.yml down
     - name: Show docker images
       run: |
         docker images
diff --git a/dockerfiles/README.rst b/dockerfiles/README.rst
index 3268de03d..8c2e31439 100644
--- a/dockerfiles/README.rst
+++ b/dockerfiles/README.rst
@@ -141,10 +141,10 @@ client:
 .. code-block:: bash
 
    $ cd dockerfiles/staging
-   $ CURRENT_UID=$(id -u):$(id -g) docker-compose up -d coordinator exporter dut
+   $ CURRENT_UID=$(id -u):$(id -g) docker compose up -d coordinator exporter dut
 
 To run the smoke test just run the client:
 
 .. code-block:: bash
 
-   $ docker-compose up client
+   $ docker compose up client