Skip to content

Commit 2750002

Browse files
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] actions/runner-images#9692 Signed-off-by: Bastian Krause <[email protected]>
1 parent fe8ee04 commit 2750002

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- name: Build amd64 docker image and validate
3939
run: |
4040
./dockerfiles/build.sh --load
41-
docker-compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client
42-
docker-compose -f dockerfiles/staging/docker-compose.yml down
41+
docker compose -f dockerfiles/staging/docker-compose.yml up --exit-code-from client client
42+
docker compose -f dockerfiles/staging/docker-compose.yml down
4343
docker images
4444
- name: Build, tag and push latest image for all platforms
4545
run: ./dockerfiles/build.sh --platform ${IMAGE_PLATFORMS} --push

.github/workflows/reusable-unit-tests-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- name: Build docker images
2323
run: |
2424
./dockerfiles/build.sh
25-
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)
26-
docker-compose -f dockerfiles/staging/docker-compose.yml down
25+
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)
26+
docker compose -f dockerfiles/staging/docker-compose.yml down
2727
- name: Show docker images
2828
run: |
2929
docker images

dockerfiles/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ client:
141141
.. code-block:: bash
142142
143143
$ cd dockerfiles/staging
144-
$ CURRENT_UID=$(id -u):$(id -g) docker-compose up -d coordinator exporter dut
144+
$ CURRENT_UID=$(id -u):$(id -g) docker compose up -d coordinator exporter dut
145145
146146
To run the smoke test just run the client:
147147

148148
.. code-block:: bash
149149
150-
$ docker-compose up client
150+
$ docker compose up client

0 commit comments

Comments
 (0)