From 17b0c26b781eb28c016611ff4eeab956cf6a05c9 Mon Sep 17 00:00:00 2001 From: Tim Stephenson <231503406+tstephen-nhs@users.noreply.github.com> Date: Fri, 14 Nov 2025 17:49:47 +0000 Subject: [PATCH 1/4] chore: enable host to specify docker group id --- .devcontainer/Dockerfile | 21 ++++++++++++++++++--- .devcontainer/devcontainer.json | 4 +++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 882e1f5a..68838998 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,14 +1,30 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu -ARG TARGETARCH -ENV TARGETARCH=${TARGETARCH} +# provide DOCKER_GID via build args if you need to force group id to match host +ARG DOCKER_GID + +# specify DOCKER_GID to force container docker group id to match host +RUN if [ -n "${DOCKER_GID}" ]; then \ + if ! getent group docker; then \ + groupadd -g ${DOCKER_GID} docker; \ + else \ + groupmod -g ${DOCKER_GID} docker; \ + fi && \ + usermod -aG docker vscode; \ + fi ARG ASDF_VERSION COPY .tool-versions.asdf /tmp/.tool-versions.asdf +ARG TARGETARCH +ENV TARGETARCH=${TARGETARCH} + # Add amd64 architecture if on arm64 RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "aarch64" ]; then dpkg --add-architecture amd64; fi +# Anticipate and resolve potential permission issues with apt +RUN mkdir -p /tmp && chmod 1777 /tmp + RUN apt-get update \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y dist-upgrade \ @@ -51,7 +67,6 @@ RUN ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' /tmp/.tool-versions.asdf) tar -xvzf /tmp/asdf.tar.gz && \ mv asdf /usr/bin - USER vscode ENV PATH="/home/vscode/.asdf/shims/:$PATH" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 046e505f..23bb9210 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,9 @@ "build": { "dockerfile": "Dockerfile", "context": "..", - "args": {} + "args": { + "DOCKER_GID": "${env:DOCKER_GID:}" + } }, "mounts": [ "source=${env:HOME}${env:USERPROFILE}/.aws,target=/home/vscode/.aws,type=bind", From 6516ba19afb2450e494c3024236dbf8964067d7f Mon Sep 17 00:00:00 2001 From: Tim Stephenson <231503406+tstephen-nhs@users.noreply.github.com> Date: Fri, 14 Nov 2025 18:02:32 +0000 Subject: [PATCH 2/4] chore: test experimental qc --- .github/workflows/pull_request.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2d6888ab..8eab2f84 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,7 +26,8 @@ jobs: TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml) echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT" quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.4 + uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@661fd3661188e23642ee33e258b70151862fbc0b + #uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.4 needs: [get_asdf_version] with: asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }} From 6cae563bdaaa43e8c608c6644b408dc348c93766 Mon Sep 17 00:00:00 2001 From: Tim Stephenson <231503406+tstephen-nhs@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:00:22 +0000 Subject: [PATCH 3/4] chore: latest qc --- .github/workflows/pull_request.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ce876dc3..123259e7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -32,8 +32,7 @@ jobs: TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml) echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT" quality_checks: - uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@661fd3661188e23642ee33e258b70151862fbc0b - #uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.4 + uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@26a3c37dbab1b2f92e3e65ab579d0440408fdfd3 needs: [get_asdf_version] with: asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }} From 81f211b225e6be31d40bec2a37fd3acabe16dbdc Mon Sep 17 00:00:00 2001 From: Tim Stephenson <231503406+tstephen-nhs@users.noreply.github.com> Date: Wed, 19 Nov 2025 15:17:12 +0000 Subject: [PATCH 4/4] revert: to main qc --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 123259e7..b284d2b4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -32,7 +32,7 @@ jobs: TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml) echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT" quality_checks: - uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@26a3c37dbab1b2f92e3e65ab579d0440408fdfd3 + uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a7daff06de7b695f601d9b1723ca184daca7d898 needs: [get_asdf_version] with: asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}