From 5f45f5c09daec4fd13add59019a8faaffef27bc2 Mon Sep 17 00:00:00 2001 From: Cristian Magherusan-Stanciu Date: Tue, 9 Jun 2026 10:04:31 -0700 Subject: [PATCH] ci: use docker compose v2 instead of docker-compose v1 ubuntu-24.04 (now ubuntu-latest) dropped the standalone docker-compose v1 binary, so the E2E job and the Makefile target failed with 'docker-compose: command not found'. Switch the command to 'docker compose' (v2, preinstalled on the runners). The docker-compose.test.yml filename is unchanged. --- .github/workflows/ci.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7444797f4..05804463a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -390,14 +390,14 @@ jobs: - name: Run E2E tests with docker-compose run: | - docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner + docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner env: COMPOSE_INTERACTIVE_NO_CLI: 1 - name: Cleanup if: always() run: | - docker-compose -f docker-compose.test.yml down -v + docker compose -f docker-compose.test.yml down -v # Assert that the Azure custom-role actions list is identical in the TF module # and the ARM onboarding template. Fast (shell + jq only), so it always runs. diff --git a/Makefile b/Makefile index ddb735e6c..d67f45b58 100644 --- a/Makefile +++ b/Makefile @@ -229,8 +229,8 @@ cost-estimate: # Docker Compose E2E tests docker-compose-test: @echo "Running E2E tests with docker-compose..." - docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner - docker-compose -f docker-compose.test.yml down -v + docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner + docker compose -f docker-compose.test.yml down -v # Install development dependencies install-dev-tools: