From 7cc46e47ebbf17695cf1c5cc279cc394981a6f4a Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 11:44:21 -0600 Subject: [PATCH 1/5] test(e2e): use GHCR mirrors for postgres and nginx compose images Point compose test fixtures at ghcr.io/devsy-org/test-images/postgres:latest and ghcr.io/devsy-org/test-images/nginx-unprivileged:latest instead of Docker Hub. Mirrors were created with buildx imagetools so the index digests match the upstream sources (postgres sha256:74935e72..., nginx-unprivileged sha256:1d26a516...). --- .../testdata/docker-compose-forward-ports/docker-compose.yaml | 2 +- .../docker-compose-multiple-services/docker-compose.yaml | 2 +- .../testdata/docker-compose-run-services/docker-compose.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/tests/up-docker-compose/testdata/docker-compose-forward-ports/docker-compose.yaml b/e2e/tests/up-docker-compose/testdata/docker-compose-forward-ports/docker-compose.yaml index a254b2601f..c6e7289475 100644 --- a/e2e/tests/up-docker-compose/testdata/docker-compose-forward-ports/docker-compose.yaml +++ b/e2e/tests/up-docker-compose/testdata/docker-compose-forward-ports/docker-compose.yaml @@ -7,4 +7,4 @@ services: volumes: - .:/workspaces:cached nginx: - image: nginxinc/nginx-unprivileged:latest + image: ghcr.io/devsy-org/test-images/nginx-unprivileged:latest diff --git a/e2e/tests/up-docker-compose/testdata/docker-compose-multiple-services/docker-compose.yaml b/e2e/tests/up-docker-compose/testdata/docker-compose-multiple-services/docker-compose.yaml index 24c1f3b118..13b520321f 100644 --- a/e2e/tests/up-docker-compose/testdata/docker-compose-multiple-services/docker-compose.yaml +++ b/e2e/tests/up-docker-compose/testdata/docker-compose-multiple-services/docker-compose.yaml @@ -7,7 +7,7 @@ services: volumes: - .:/workspaces:cached db: - image: postgres:latest + image: ghcr.io/devsy-org/test-images/postgres:latest restart: unless-stopped volumes: - postgres-data:/var/lib/postgresql/data diff --git a/e2e/tests/up-docker-compose/testdata/docker-compose-run-services/docker-compose.yaml b/e2e/tests/up-docker-compose/testdata/docker-compose-run-services/docker-compose.yaml index 24c1f3b118..13b520321f 100644 --- a/e2e/tests/up-docker-compose/testdata/docker-compose-run-services/docker-compose.yaml +++ b/e2e/tests/up-docker-compose/testdata/docker-compose-run-services/docker-compose.yaml @@ -7,7 +7,7 @@ services: volumes: - .:/workspaces:cached db: - image: postgres:latest + image: ghcr.io/devsy-org/test-images/postgres:latest restart: unless-stopped volumes: - postgres-data:/var/lib/postgresql/data From 4a404a49a107d4d4be794add7bfa7be78384a02f Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 14:55:39 -0600 Subject: [PATCH 2/5] ci(e2e): log in to GHCR before up-docker-compose tests The test-images/postgres and nginx-unprivileged GHCR packages are private, so anonymous runner pulls fail with unauthorized. Grant the integration job packages:read and log in with GITHUB_TOKEN before compose tests. --- .github/workflows/pr-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 883ae64237..cc7268ef90 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -493,6 +493,9 @@ jobs: name: Test ${{ matrix.label }}${{ (matrix.install-podman == 'rootless' || matrix.install-podman == 'rootful') && format(' ({0})', matrix.install-podman) || '' }} on ${{ matrix.runner }} needs: [changes, can-read-secret, build-cli] if: needs.changes.outputs.go == 'true' + permissions: + contents: read + packages: read strategy: fail-fast: false matrix: @@ -1137,6 +1140,13 @@ jobs: private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }} owner: ${{ github.repository_owner }} + - name: log in to GHCR for test-images pulls + if: runner.os == 'Linux' && matrix.label == 'up-docker-compose' + env: + GHCR_USER: ${{ github.actor }} + GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: printf '%s' "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USER" --password-stdin + - name: test Compose UID mapping as existing non-root runner if: runner.os == 'Linux' && matrix.label == 'up-docker-compose' shell: bash From 37c97b45c9d808a451d35d2736f2c0e7752aa8f2 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 15:57:24 -0600 Subject: [PATCH 3/5] ci(e2e): log in to GHCR as root for sudo'd compose run The e2e binary runs under sudo, which reads root's docker config, not the runner user's. Log in as both so test-images pulls authenticate. --- .github/workflows/pr-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index cc7268ef90..3e4c34b01c 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -1145,7 +1145,9 @@ jobs: env: GHCR_USER: ${{ github.actor }} GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: printf '%s' "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USER" --password-stdin + run: | + printf '%s' "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USER" --password-stdin + printf '%s' "$GHCR_TOKEN" | sudo docker login ghcr.io -u "$GHCR_USER" --password-stdin - name: test Compose UID mapping as existing non-root runner if: runner.os == 'Linux' && matrix.label == 'up-docker-compose' From 06f1ec92a6ee08aee408b92d2cfa164f356e46d6 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 18:44:15 -0600 Subject: [PATCH 4/5] ci(e2e): drop single-label GHCR login The up-docker-compose-only login did not unblock the multiple-services spec: test-images/postgres is still private, and the authenticated pull returned 'denied' (run 38474399648). Public packages pull anonymously (nginx-unprivileged verified 200 without auth), so the login is unneeded for them. Revert to main until postgres visibility is fixed. --- .github/workflows/pr-ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 3e4c34b01c..1c5d24c56e 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -167,6 +167,8 @@ jobs: - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 with: go-version-file: go.mod + # Windows cache archiving can consume the post-job budget after a successful build. + cache: ${{ runner.os != 'Windows' }} - name: get operating system lowercase id: os @@ -358,6 +360,8 @@ jobs: expected-spec-count: 4 - label: up-provider-microsandbox-logs-cancel expected-spec-count: 6 + - label: up-provider-microsandbox-compatibility + expected-spec-count: 2 runs-on: ubuntu-latest timeout-minutes: 25 steps: @@ -493,9 +497,6 @@ jobs: name: Test ${{ matrix.label }}${{ (matrix.install-podman == 'rootless' || matrix.install-podman == 'rootful') && format(' ({0})', matrix.install-podman) || '' }} on ${{ matrix.runner }} needs: [changes, can-read-secret, build-cli] if: needs.changes.outputs.go == 'true' - permissions: - contents: read - packages: read strategy: fail-fast: false matrix: @@ -1140,15 +1141,6 @@ jobs: private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }} owner: ${{ github.repository_owner }} - - name: log in to GHCR for test-images pulls - if: runner.os == 'Linux' && matrix.label == 'up-docker-compose' - env: - GHCR_USER: ${{ github.actor }} - GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - printf '%s' "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USER" --password-stdin - printf '%s' "$GHCR_TOKEN" | sudo docker login ghcr.io -u "$GHCR_USER" --password-stdin - - name: test Compose UID mapping as existing non-root runner if: runner.os == 'Linux' && matrix.label == 'up-docker-compose' shell: bash From 47f414c3ec221a84a1ed954bb0eeac6be16a6f27 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 18:44:40 -0600 Subject: [PATCH 5/5] ci(e2e): restore pr-ci.yml to PR base Previous commit pulled unrelated main changes into pr-ci.yml. Restore the PR base version so the only change to this file is the removal of the login step, which is verified to be unnecessary (see prior commit). --- .github/workflows/pr-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 1c5d24c56e..883ae64237 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -167,8 +167,6 @@ jobs: - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 with: go-version-file: go.mod - # Windows cache archiving can consume the post-job budget after a successful build. - cache: ${{ runner.os != 'Windows' }} - name: get operating system lowercase id: os @@ -360,8 +358,6 @@ jobs: expected-spec-count: 4 - label: up-provider-microsandbox-logs-cancel expected-spec-count: 6 - - label: up-provider-microsandbox-compatibility - expected-spec-count: 2 runs-on: ubuntu-latest timeout-minutes: 25 steps: