Skip to content

Commit 54d444a

Browse files
committed
fix it
1 parent 08472c0 commit 54d444a

5 files changed

Lines changed: 38 additions & 38 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:pr-15-a1b9b25
1+
ARG IMAGE_VERSION=latest
2+
FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:${IMAGE_VERSION}
23

34
USER root
45
# specify DOCKER_GID to force container docker group id to match host

.devcontainer/devcontainer.json

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,39 @@
77
"dockerfile": "Dockerfile",
88
"context": "..",
99
"args": {
10-
"DOCKER_GID": "${env:DOCKER_GID:}"
11-
}
12-
},
13-
"mounts": [
14-
"source=${env:HOME}${env:USERPROFILE}/.aws,target=/home/vscode/.aws,type=bind",
15-
"source=${env:HOME}${env:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
16-
"source=${env:HOME}${env:USERPROFILE}/.gnupg,target=/home/vscode/.gnupg,type=bind",
17-
"source=${env:HOME}${env:USERPROFILE}/.npmrc,target=/home/vscode/.npmrc,type=bind",
18-
"source=${env:HOME}${env:USERPROFILE}/.gitconfig,target=/home/vscode/.gitconfig,type=bind"
19-
],
20-
"containerUser": "vscode",
21-
"remoteEnv": {
22-
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
23-
},
24-
"features": {},
25-
"customizations": {
26-
"vscode": {
27-
"extensions": [
28-
"AmazonWebServices.aws-toolkit-vscode",
29-
"redhat.vscode-yaml",
30-
"eamodio.gitlens",
31-
"github.vscode-pull-request-github",
32-
"streetsidesoftware.code-spell-checker",
33-
"timonwong.shellcheck",
34-
"github.vscode-github-actions"
35-
],
36-
"settings": {
37-
"cSpell.words": [
38-
"fhir",
39-
"Formik",
40-
"pino",
41-
"serialisation"
42-
]
10+
"DOCKER_GID": "${env:DOCKER_GID:}",
11+
"IMAGE_VERSION": "pr-15-c27cba7" // This arg is used in the Dockerfile to specify the base image version }
12+
},
13+
"mounts": [
14+
"source=${env:HOME}${env:USERPROFILE}/.aws,target=/home/vscode/.aws,type=bind",
15+
"source=${env:HOME}${env:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
16+
"source=${env:HOME}${env:USERPROFILE}/.gnupg,target=/home/vscode/.gnupg,type=bind",
17+
"source=${env:HOME}${env:USERPROFILE}/.npmrc,target=/home/vscode/.npmrc,type=bind"
18+
],
19+
"containerUser": "vscode",
20+
"remoteEnv": {
21+
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
22+
},
23+
"features": {},
24+
"customizations": {
25+
"vscode": {
26+
"extensions": [
27+
"AmazonWebServices.aws-toolkit-vscode",
28+
"redhat.vscode-yaml",
29+
"eamodio.gitlens",
30+
"github.vscode-pull-request-github",
31+
"streetsidesoftware.code-spell-checker",
32+
"timonwong.shellcheck",
33+
"github.vscode-github-actions"
34+
],
35+
"settings": {
36+
"cSpell.words": [
37+
"fhir",
38+
"Formik",
39+
"pino",
40+
"serialisation"
41+
]
42+
}
4343
}
4444
}
4545
}
46-
}

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
needs: [get_asdf_version]
3939
with:
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
41-
runtime_docker_image: "ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:v1.0.0"
41+
runtime_docker_image: "ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:pr-15-c27cba7"
4242
secrets:
4343
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4444
tag_release:

.github/workflows/quality-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ jobs:
431431
runs-on: ubuntu-22.04
432432
container:
433433
image: ${{ inputs.runtime_docker_image }}
434-
options: --user 0
434+
options: --user 1001:1001
435435
steps:
436436
- *checkout
437437

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: ./.github/workflows/quality-checks.yml
3131
with:
3232
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
33-
runtime_docker_image: "ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:v1.0.0"
33+
runtime_docker_image: "ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:pr-15-c27cba7"
3434
secrets:
3535
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3636
tag_release:

0 commit comments

Comments
 (0)