Merge pull request #1460 from Bastian-Krause/bst/bst-docker-compose-v2

docker: move to Docker compose v2

Author: Emantor

.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

.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

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

dockerfiles/staging/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.3'
 services:
   coordinator:
     image: "${IMAGE_PREFIX:-docker.io/labgrid/}coordinator"