Skip to content

Commit 768429e

Browse files
chrmartiCopilot
andcommitted
Scope Bake entitlement workaround to affected Compose versions
Set BUILDX_BAKE_ENTITLEMENTS_FS=0 for Compose 2.38.2 and 5.6.0 in the affected CI jobs. Leave other versions and installed tools unchanged. This minimal alternative to #1330 and #1331 avoids probes or downloads and explicitly warns about disabled filesystem and SSH-agent consent checks. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 155f8b2 commit 768429e

3 files changed

Lines changed: 21 additions & 0 deletions

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Set up Compose build workaround
2+
description: Disable Bake filesystem entitlement checks for the affected runner Compose versions.
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Check Compose version
8+
shell: bash
9+
run: |
10+
version=$(docker compose version --short)
11+
echo "Compose version: $version"
12+
# Temporary workaround for https://github.com/devcontainers/cli/issues/1320.
13+
case "${version#v}" in
14+
2.38.2|5.6.0)
15+
echo "::warning::Disabling Bake filesystem and default SSH-agent consent checks for Compose $version."
16+
echo "BUILDX_BAKE_ENTITLEMENTS_FS=0" >> "$GITHUB_ENV"
17+
;;
18+
esac

‎.github/workflows/dev-containers.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
run: yarn type-check
105105
- name: Package
106106
run: yarn package
107+
- uses: ./.github/actions/setup-compose
107108
- name: Run Tests
108109
run: yarn test-matrix --forbid-only ${{ matrix.mocha-args }}
109110
env:

‎.github/workflows/test-docker-v29.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
sudo VERSION=29.0.0 sh get-docker.sh
3030
sudo systemctl restart docker
3131
32+
- uses: ./.github/actions/setup-compose
33+
3234
- name: Verify Docker version, Install and Test
3335
run: |
3436
# Verify

0 commit comments

Comments
 (0)