From a9adadb3a05afcb3b46b2f1303aad50537771ce2 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 16 Oct 2025 08:47:08 +0200 Subject: [PATCH 1/3] investigate CI failure --- .../docker-from-docker-non-root/.devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json index e37fa0d26..2e3f96b6b 100644 --- a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json +++ b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json @@ -55,6 +55,7 @@ // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "./scripts/go-tools.sh", + "postStartCommand": "echo 'UID INFO'; id; ls -l /var/run/docker.sock", "remoteUser": "vscode", From 667c7670b65e8d7c04c6a845c9563065b5fac2eb Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 16 Oct 2025 09:19:34 +0200 Subject: [PATCH 2/3] investigate CI failure --- .github/workflows/ci_common.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci_common.yml b/.github/workflows/ci_common.yml index 30dd099eb..785c47711 100644 --- a/.github/workflows/ci_common.yml +++ b/.github/workflows/ci_common.yml @@ -764,6 +764,9 @@ jobs: (cd common && npm install && npm run build) (cd github-action/ && npm install && npm run build && npm run package) + - name: UID INFO + run: echo 'UID INFO'; id; ls -l /var/run/docker.sock + - name: Run test uses: ./ with: From 68b94bf5a6784642d518566ac1cbdc31f01b4e7a Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 16 Oct 2025 10:14:43 +0200 Subject: [PATCH 3/3] try set docker GID --- .github/workflows/ci_common.yml | 6 ++++++ .../docker-from-docker-non-root/.devcontainer/Dockerfile | 8 +++++++- .../.devcontainer/devcontainer.json | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_common.yml b/.github/workflows/ci_common.yml index 785c47711..94ee77639 100644 --- a/.github/workflows/ci_common.yml +++ b/.github/workflows/ci_common.yml @@ -767,6 +767,10 @@ jobs: - name: UID INFO run: echo 'UID INFO'; id; ls -l /var/run/docker.sock + - name: Set DOCKER_GID + run: | + echo "DOCKER_GID=$(getent group docker | cut -d: -f3)" >> $GITHUB_ENV + - name: Run test uses: ./ with: @@ -778,6 +782,8 @@ jobs: eventFilterForPush: | push pull_request + env: + DOCKER_GID: ${{ env.DOCKER_GID }} test-gh-docker-from-docker-root: name: Run GitHub docker-from-docker-root test diff --git a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/Dockerfile b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/Dockerfile index b513a0406..ad519b684 100644 --- a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/Dockerfile +++ b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/Dockerfile @@ -52,7 +52,13 @@ COPY scripts/docker-client.sh /tmp/ RUN /tmp/docker-client.sh #Add user to docker group -RUN sudo groupadd docker && sudo usermod -aG docker $USERNAME && newgrp docker +ARG DOCKER_GID= +RUN if [ -n "$DOCKER_GID" ]; then \ + sudo groupadd -g $DOCKER_GID docker; \ + else \ + sudo groupadd docker; \ + fi \ + && sudo usermod -aG docker $USERNAME # __DEVCONTAINER_SNIPPET_INSERT__ (control where snippets get inserted using the devcontainer CLI) diff --git a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json index 2e3f96b6b..bd644974f 100644 --- a/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json +++ b/github-tests/Dockerfile/docker-from-docker-non-root/.devcontainer/devcontainer.json @@ -4,6 +4,9 @@ "name": "dc-test", "dockerFile": "Dockerfile", "build": { + "args": { + "DOCKER_GID": "${localEnv:DOCKER_GID}" + }, "cacheFrom": "ghcr.io/devcontainers/ci/tests/docker-from-docker-non-root:latest" },