From 481032d3c0314ed631156cf9f7b7ff61afc7a88b Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 21 Oct 2026 11:49:39 +0200 Subject: [PATCH] Match Compose patch releases in the Bake workaround Cover all stable 2.38.x and 5.6.x releases, including the Go security update in Compose 5.6.1 that still lacks the external-Dockerfile fix. Preserve other minor versions and prerelease/development builds. Follow-up to #1332 to unblock CI on #1329. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/actions/setup-compose/action.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-compose/action.yml b/.github/actions/setup-compose/action.yml index 2b43a06fc..6b5c7f3fb 100644 --- a/.github/actions/setup-compose/action.yml +++ b/.github/actions/setup-compose/action.yml @@ -1,5 +1,5 @@ name: Set up Compose build workaround -description: Disable Bake filesystem entitlement checks for the affected runner Compose versions. +description: Disable Bake filesystem entitlement checks for Compose 2.38.x and 5.6.x patch releases. runs: using: composite @@ -10,9 +10,7 @@ runs: version=$(docker compose version --short) echo "Compose version: $version" # Temporary workaround for https://github.com/devcontainers/cli/issues/1320. - case "${version#v}" in - 2.38.2|5.6.0) - echo "::warning::Disabling Bake filesystem and default SSH-agent consent checks for Compose $version." - echo "BUILDX_BAKE_ENTITLEMENTS_FS=0" >> "$GITHUB_ENV" - ;; - esac + if [[ "${version#v}" =~ ^(2\.38|5\.6)\.[0-9]+$ ]]; then + echo "::warning::Disabling Bake filesystem and default SSH-agent consent checks for Compose $version." + echo "BUILDX_BAKE_ENTITLEMENTS_FS=0" >> "$GITHUB_ENV" + fi