From 86614ede2288d407236d9653b8a9f41c3fcb5150 Mon Sep 17 00:00:00 2001 From: Shankari Date: Sun, 4 Aug 2024 07:09:26 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Use=20`docker=20compose`=20instead?= =?UTF-8?q?=20of=20`docker-compose`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To fix the CI/CD pipeline. It looks like the underlying github action image has been updated so it no longer has the `docker-compose` alias --- .github/workflows/nominatim-docker-test.yml | 2 +- .github/workflows/test-with-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nominatim-docker-test.yml b/.github/workflows/nominatim-docker-test.yml index c684b1fde..3743a5483 100644 --- a/.github/workflows/nominatim-docker-test.yml +++ b/.github/workflows/nominatim-docker-test.yml @@ -25,6 +25,6 @@ jobs: # Passes the geofabrik key into the docker-compose.yml file. - name: Test nominatim.py - run: GFBK_KEY=${{ secrets.GEOFABRIK_API }} docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server + run: GFBK_KEY=${{ secrets.GEOFABRIK_API }} docker compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server diff --git a/.github/workflows/test-with-docker.yml b/.github/workflows/test-with-docker.yml index e38499544..1b54ed5ba 100644 --- a/.github/workflows/test-with-docker.yml +++ b/.github/workflows/test-with-docker.yml @@ -30,4 +30,4 @@ jobs: run: echo Smoke test - name: Run the tests using docker-compose - run: docker-compose -f setup/docker-compose.tests.yml up --exit-code-from web-server + run: docker compose -f setup/docker-compose.tests.yml up --exit-code-from web-server