From c4b61a8656958fa9c99baf906d32a171bd2a97f9 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Wed, 11 Mar 2026 12:31:38 +0000 Subject: [PATCH 1/4] setup golang --- .../.devcontainer/.tool-versions | 4 ++++ .../.devcontainer/devcontainer.json | 18 ++++++++++++++++++ .../.devcontainer/scripts/root_install.sh | 7 +++++++ .../.devcontainer/scripts/vscode_install.sh | 13 +++++++++++++ .../.trivyignore.yaml | 11 +++++++++++ .../node_24_python_3_14_golang_1_24/trivy.yaml | 1 + 6 files changed, 54 insertions(+) create mode 100644 src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions create mode 100644 src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json create mode 100755 src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh create mode 100755 src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh create mode 100644 src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml create mode 100644 src/languages/node_24_python_3_14_golang_1_24/trivy.yaml diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions new file mode 100644 index 0000000..1606e41 --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions @@ -0,0 +1,4 @@ +python 3.14.3 +poetry 2.3.2 +golang 1.24.13 +golangci-lint 2.11.3 diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json new file mode 100644 index 0000000..8580944 --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json @@ -0,0 +1,18 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu +{ + "name": "EPS Devcontainer node_24 python_3.14", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "build": { + "dockerfile": "../../../common_node_24/Dockerfile", + "args": { + "CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}", + "MULTI_ARCH_TAG": "${localEnv:MULTI_ARCH_TAG}", + "BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}", + "IMAGE_TAG": "${localEnv:IMAGE_TAG}" + }, + "context": "." + }, + "features": {} + } + diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh new file mode 100755 index 0000000..52fa2b1 --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -e +export DEBIAN_FRONTEND=noninteractive + +# clean up +apt-get clean +rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh new file mode 100755 index 0000000..d370999 --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -e + +asdf plugin add python +asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git +asdf plugin add golang +asdf plugin add golangci-lint + +asdf install python +asdf install + +# install cfn-lint +pip install --user cfn-lint diff --git a/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml b/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml new file mode 100644 index 0000000..8799951 --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml @@ -0,0 +1,11 @@ +vulnerabilities: + - id: CVE-2026-23949 + statement: "jaraco.context: jaraco.context: Path traversal via malicious tar archives" + purls: + - "pkg:pypi/jaraco.context@5.3.0" + expired_at: 2026-08-12 + - id: CVE-2026-24049 + statement: "wheel: wheel: Privilege Escalation or Arbitrary Code Execution via malicious wheel file unpacking" + purls: + - "pkg:pypi/wheel@0.45.1" + expired_at: 2026-08-12 diff --git a/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml b/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml new file mode 100644 index 0000000..bb05d3f --- /dev/null +++ b/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml @@ -0,0 +1 @@ +ignorefile: "src/languages/node_24_python_3_14_golang_1_24/.trivyignore_combined.yaml" From 715e5cab4c47dfae1b605094239a9bde1ffe81c0 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Wed, 11 Mar 2026 13:27:17 +0000 Subject: [PATCH 2/4] fix new vulns --- src/base/.devcontainer/.tool-versions | 4 +-- .../node_24/.devcontainer/.tool-versions | 2 +- src/common/.trivyignore.yaml | 27 +++++++++++++++++ src/common_node_24/.trivyignore.yaml | 30 +++++++++++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/base/.devcontainer/.tool-versions b/src/base/.devcontainer/.tool-versions index 24d49bd..bac5b7b 100644 --- a/src/base/.devcontainer/.tool-versions +++ b/src/base/.devcontainer/.tool-versions @@ -1,6 +1,6 @@ shellcheck 0.11.0 direnv 2.37.1 -actionlint 1.7.10 +actionlint 1.7.11 ruby 3.3.0 trivy 0.69.3 -yq 4.52.2 +yq 4.52.4 diff --git a/src/base_node/node_24/.devcontainer/.tool-versions b/src/base_node/node_24/.devcontainer/.tool-versions index 1b05724..01c1e7d 100644 --- a/src/base_node/node_24/.devcontainer/.tool-versions +++ b/src/base_node/node_24/.devcontainer/.tool-versions @@ -1 +1 @@ -nodejs 24.13.0 +nodejs 24.14.0 diff --git a/src/common/.trivyignore.yaml b/src/common/.trivyignore.yaml index 1f9727c..c40de8a 100644 --- a/src/common/.trivyignore.yaml +++ b/src/common/.trivyignore.yaml @@ -360,3 +360,30 @@ vulnerabilities: purls: - "pkg:deb/ubuntu/linux-libc-dev@5.15.0-170.180?arch=amd64&distro=ubuntu-22.04" expired_at: 2026-09-09 + - id: CVE-2026-25679 + statement: "url.Parse insufficiently validated the host/authority component and ac ..." + purls: + - "pkg:golang/stdlib@v1.16.15" + - "pkg:golang/stdlib@v1.23.4" + - "pkg:golang/stdlib@v1.24.4" + - "pkg:golang/stdlib@v1.24.9" + - "pkg:golang/stdlib@v1.25.5" + - "pkg:golang/stdlib@v1.25.7" + - "pkg:golang/stdlib@v1.26.0" + expired_at: 2026-09-11 + - id: CVE-2026-27142 + statement: "Actions which insert URLs into the content attribute of HTML meta tags ..." + purls: + - "pkg:golang/stdlib@v1.16.15" + - "pkg:golang/stdlib@v1.23.4" + - "pkg:golang/stdlib@v1.24.4" + - "pkg:golang/stdlib@v1.24.9" + - "pkg:golang/stdlib@v1.25.5" + - "pkg:golang/stdlib@v1.25.7" + - "pkg:golang/stdlib@v1.26.0" + expired_at: 2026-09-11 + - id: CVE-2026-27137 + statement: "When verifying a certificate chain which contains a certificate contai ..." + purls: + - "pkg:golang/stdlib@v1.26.0" + expired_at: 2026-09-11 diff --git a/src/common_node_24/.trivyignore.yaml b/src/common_node_24/.trivyignore.yaml index 9fff67e..6bd3f8a 100644 --- a/src/common_node_24/.trivyignore.yaml +++ b/src/common_node_24/.trivyignore.yaml @@ -63,3 +63,33 @@ vulnerabilities: purls: - "pkg:npm/tar@7.5.1" expired_at: 2026-09-09 + - id: CVE-2026-26996 + statement: "minimatch: minimatch: Denial of Service via specially crafted glob patterns" + purls: + - "pkg:npm/minimatch@10.1.2" + expired_at: 2026-09-11 + - id: CVE-2026-27903 + statement: "minimatch: minimatch: Denial of Service due to unbounded recursive backtracking via crafted glob patterns" + purls: + - "pkg:npm/minimatch@10.1.2" + expired_at: 2026-09-11 + - id: CVE-2026-27904 + statement: "minimatch: Minimatch: Denial of Service via catastrophic backtracking in glob expressions" + purls: + - "pkg:npm/minimatch@10.1.2" + expired_at: 2026-09-11 + - id: CVE-2026-26960 + statement: "tar: node-tar: node-tar: Arbitrary file read/write via malicious archive hardlink creation" + purls: + - "pkg:npm/tar@7.5.7" + expired_at: 2026-09-11 + - id: CVE-2026-29786 + statement: "node-tar: hardlink path traversal via drive-relative linkpath" + purls: + - "pkg:npm/tar@7.5.7" + expired_at: 2026-09-11 + - id: CVE-2026-31802 + statement: "node-tar Symlink Path Traversal via Drive-Relative Linkpath" + purls: + - "pkg:npm/tar@7.5.7" + expired_at: 2026-09-11 From ef73d91b1d58d4295e1dcb57f2f037a88e428ee0 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Wed, 11 Mar 2026 14:07:21 +0000 Subject: [PATCH 3/4] new trivy --- .../node_24_python_3_14_golang_1_24/.trivyignore.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml b/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml index 8799951..93088a1 100644 --- a/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml +++ b/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml @@ -9,3 +9,13 @@ vulnerabilities: purls: - "pkg:pypi/wheel@0.45.1" expired_at: 2026-08-12 + - id: CVE-2026-25679 + statement: "url.Parse insufficiently validated the host/authority component and ac ..." + purls: + - "pkg:golang/stdlib@v1.24.13" + expired_at: 2026-09-11 + - id: CVE-2026-27142 + statement: "Actions which insert URLs into the content attribute of HTML meta tags ..." + purls: + - "pkg:golang/stdlib@v1.24.13" + expired_at: 2026-09-11 From 960f8b40cd42f8e478277c5bc4966171ad2543e0 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Wed, 11 Mar 2026 14:54:19 +0000 Subject: [PATCH 4/4] move files to get more re-use --- .../.devcontainer/.tool-versions | 2 +- .../trivy.yaml | 1 - .../node_24_python_3_14_java_24/trivy.yaml | 1 - .../.devcontainer/.tool-versions | 2 - .../.devcontainer/Dockerfile | 39 +++++++++++++++++++ .../.devcontainer/devcontainer.json | 4 +- .../.devcontainer/scripts/root_install.sh | 0 .../.devcontainer/scripts/vscode_install.sh | 3 -- .../.trivyignore.yaml | 0 .../trivy.yaml | 1 + .../.devcontainer/.tool-versions | 2 - .../.devcontainer/Dockerfile | 39 +++++++++++++++++++ .../.devcontainer/devcontainer.json | 4 +- .../.devcontainer/scripts/root_install.sh | 0 .../.devcontainer/scripts/vscode_install.sh | 3 -- .../.trivyignore.yaml | 0 .../node_24_python_3_14_java_24/trivy.yaml | 1 + 17 files changed, 85 insertions(+), 17 deletions(-) delete mode 100644 src/languages/node_24_python_3_14_golang_1_24/trivy.yaml delete mode 100644 src/languages/node_24_python_3_14_java_24/trivy.yaml rename src/{languages => projects}/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions (57%) create mode 100644 src/projects/node_24_python_3_14_golang_1_24/.devcontainer/Dockerfile rename src/{languages/node_24_python_3_14_java_24 => projects/node_24_python_3_14_golang_1_24}/.devcontainer/devcontainer.json (84%) rename src/{languages => projects}/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh (100%) rename src/{languages => projects}/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh (55%) rename src/{languages => projects}/node_24_python_3_14_golang_1_24/.trivyignore.yaml (100%) create mode 100644 src/projects/node_24_python_3_14_golang_1_24/trivy.yaml rename src/{languages => projects}/node_24_python_3_14_java_24/.devcontainer/.tool-versions (57%) create mode 100644 src/projects/node_24_python_3_14_java_24/.devcontainer/Dockerfile rename src/{languages/node_24_python_3_14_golang_1_24 => projects/node_24_python_3_14_java_24}/.devcontainer/devcontainer.json (84%) rename src/{languages => projects}/node_24_python_3_14_java_24/.devcontainer/scripts/root_install.sh (100%) rename src/{languages => projects}/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh (53%) rename src/{languages => projects}/node_24_python_3_14_java_24/.trivyignore.yaml (100%) create mode 100644 src/projects/node_24_python_3_14_java_24/trivy.yaml diff --git a/src/languages/node_24_python_3_12/.devcontainer/.tool-versions b/src/languages/node_24_python_3_12/.devcontainer/.tool-versions index 9dedcf5..32c2ed8 100644 --- a/src/languages/node_24_python_3_12/.devcontainer/.tool-versions +++ b/src/languages/node_24_python_3_12/.devcontainer/.tool-versions @@ -1,2 +1,2 @@ -python 3.12.12 +python 3.12.13 poetry 2.3.2 diff --git a/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml b/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml deleted file mode 100644 index bb05d3f..0000000 --- a/src/languages/node_24_python_3_14_golang_1_24/trivy.yaml +++ /dev/null @@ -1 +0,0 @@ -ignorefile: "src/languages/node_24_python_3_14_golang_1_24/.trivyignore_combined.yaml" diff --git a/src/languages/node_24_python_3_14_java_24/trivy.yaml b/src/languages/node_24_python_3_14_java_24/trivy.yaml deleted file mode 100644 index ddcfb05..0000000 --- a/src/languages/node_24_python_3_14_java_24/trivy.yaml +++ /dev/null @@ -1 +0,0 @@ -ignorefile: "src/languages/node_24_python_3_14_java_24/.trivyignore_combined.yaml" diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions similarity index 57% rename from src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions rename to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions index 1606e41..d6d2aee 100644 --- a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions +++ b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions @@ -1,4 +1,2 @@ -python 3.14.3 -poetry 2.3.2 golang 1.24.13 golangci-lint 2.11.3 diff --git a/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/Dockerfile b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/Dockerfile new file mode 100644 index 0000000..44dcde1 --- /dev/null +++ b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/Dockerfile @@ -0,0 +1,39 @@ +ARG BASE_VERSION_TAG=latest +ARG BASE_IMAGE=ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:${BASE_VERSION_TAG} + +FROM ${BASE_IMAGE} + +ARG SCRIPTS_DIR=/usr/local/share/eps +ARG CONTAINER_NAME +ARG MULTI_ARCH_TAG +ARG BASE_VERSION_TAG +ARG IMAGE_TAG +ARG TARGETARCH + +ENV SCRIPTS_DIR=${SCRIPTS_DIR} +ENV CONTAINER_NAME=${CONTAINER_NAME} +ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG} +ENV BASE_VERSION_TAG=${BASE_VERSION_TAG} +ENV IMAGE_TAG=${IMAGE_TAG} +ENV TARGETARCH=${TARGETARCH} + +LABEL org.opencontainers.image.description="EPS devcontainer ${CONTAINER_NAME}:${IMAGE_TAG}" +LABEL org.opencontainers.image.version=${IMAGE_TAG} +LABEL org.opencontainers.image.base.name=${BASE_IMAGE} +LABEL org.opencontainers.image.containerName=${CONTAINER_NAME} + +USER root +COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME} +WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME} +RUN ./root_install.sh + +USER vscode + +WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME} +COPY .tool-versions /tmp/.tool-versions +RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions + +RUN ./vscode_install.sh + +# Switch back to root to install the devcontainer CLI globally +USER root diff --git a/src/languages/node_24_python_3_14_java_24/.devcontainer/devcontainer.json b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json similarity index 84% rename from src/languages/node_24_python_3_14_java_24/.devcontainer/devcontainer.json rename to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json index 8580944..e84c9ef 100644 --- a/src/languages/node_24_python_3_14_java_24/.devcontainer/devcontainer.json +++ b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json @@ -1,10 +1,10 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu { - "name": "EPS Devcontainer node_24 python_3.14", + "name": "EPS Devcontainer node_24 python_3.14_golang_1.24", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "build": { - "dockerfile": "../../../common_node_24/Dockerfile", + "dockerfile": "Dockerfile", "args": { "CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}", "MULTI_ARCH_TAG": "${localEnv:MULTI_ARCH_TAG}", diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh similarity index 100% rename from src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh rename to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/scripts/root_install.sh diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh similarity index 55% rename from src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh rename to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh index d370999..23126b3 100755 --- a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh +++ b/src/projects/node_24_python_3_14_golang_1_24/.devcontainer/scripts/vscode_install.sh @@ -1,12 +1,9 @@ #!/usr/bin/env bash set -e -asdf plugin add python -asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git asdf plugin add golang asdf plugin add golangci-lint -asdf install python asdf install # install cfn-lint diff --git a/src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml b/src/projects/node_24_python_3_14_golang_1_24/.trivyignore.yaml similarity index 100% rename from src/languages/node_24_python_3_14_golang_1_24/.trivyignore.yaml rename to src/projects/node_24_python_3_14_golang_1_24/.trivyignore.yaml diff --git a/src/projects/node_24_python_3_14_golang_1_24/trivy.yaml b/src/projects/node_24_python_3_14_golang_1_24/trivy.yaml new file mode 100644 index 0000000..1af5385 --- /dev/null +++ b/src/projects/node_24_python_3_14_golang_1_24/trivy.yaml @@ -0,0 +1 @@ +ignorefile: "src/projects/node_24_python_3_14_golang_1_24/.trivyignore_combined.yaml" diff --git a/src/languages/node_24_python_3_14_java_24/.devcontainer/.tool-versions b/src/projects/node_24_python_3_14_java_24/.devcontainer/.tool-versions similarity index 57% rename from src/languages/node_24_python_3_14_java_24/.devcontainer/.tool-versions rename to src/projects/node_24_python_3_14_java_24/.devcontainer/.tool-versions index 944ca8c..efcd8fa 100644 --- a/src/languages/node_24_python_3_14_java_24/.devcontainer/.tool-versions +++ b/src/projects/node_24_python_3_14_java_24/.devcontainer/.tool-versions @@ -1,4 +1,2 @@ -python 3.14.3 -poetry 2.3.2 java temurin-24.0.2+12 maven 3.9.13 diff --git a/src/projects/node_24_python_3_14_java_24/.devcontainer/Dockerfile b/src/projects/node_24_python_3_14_java_24/.devcontainer/Dockerfile new file mode 100644 index 0000000..44dcde1 --- /dev/null +++ b/src/projects/node_24_python_3_14_java_24/.devcontainer/Dockerfile @@ -0,0 +1,39 @@ +ARG BASE_VERSION_TAG=latest +ARG BASE_IMAGE=ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_14:${BASE_VERSION_TAG} + +FROM ${BASE_IMAGE} + +ARG SCRIPTS_DIR=/usr/local/share/eps +ARG CONTAINER_NAME +ARG MULTI_ARCH_TAG +ARG BASE_VERSION_TAG +ARG IMAGE_TAG +ARG TARGETARCH + +ENV SCRIPTS_DIR=${SCRIPTS_DIR} +ENV CONTAINER_NAME=${CONTAINER_NAME} +ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG} +ENV BASE_VERSION_TAG=${BASE_VERSION_TAG} +ENV IMAGE_TAG=${IMAGE_TAG} +ENV TARGETARCH=${TARGETARCH} + +LABEL org.opencontainers.image.description="EPS devcontainer ${CONTAINER_NAME}:${IMAGE_TAG}" +LABEL org.opencontainers.image.version=${IMAGE_TAG} +LABEL org.opencontainers.image.base.name=${BASE_IMAGE} +LABEL org.opencontainers.image.containerName=${CONTAINER_NAME} + +USER root +COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME} +WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME} +RUN ./root_install.sh + +USER vscode + +WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME} +COPY .tool-versions /tmp/.tool-versions +RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions + +RUN ./vscode_install.sh + +# Switch back to root to install the devcontainer CLI globally +USER root diff --git a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json b/src/projects/node_24_python_3_14_java_24/.devcontainer/devcontainer.json similarity index 84% rename from src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json rename to src/projects/node_24_python_3_14_java_24/.devcontainer/devcontainer.json index 8580944..65abfbe 100644 --- a/src/languages/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json +++ b/src/projects/node_24_python_3_14_java_24/.devcontainer/devcontainer.json @@ -1,10 +1,10 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu { - "name": "EPS Devcontainer node_24 python_3.14", + "name": "EPS Devcontainer node_24 python_3.14_java_24", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "build": { - "dockerfile": "../../../common_node_24/Dockerfile", + "dockerfile": "Dockerfile", "args": { "CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}", "MULTI_ARCH_TAG": "${localEnv:MULTI_ARCH_TAG}", diff --git a/src/languages/node_24_python_3_14_java_24/.devcontainer/scripts/root_install.sh b/src/projects/node_24_python_3_14_java_24/.devcontainer/scripts/root_install.sh similarity index 100% rename from src/languages/node_24_python_3_14_java_24/.devcontainer/scripts/root_install.sh rename to src/projects/node_24_python_3_14_java_24/.devcontainer/scripts/root_install.sh diff --git a/src/languages/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh b/src/projects/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh similarity index 53% rename from src/languages/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh rename to src/projects/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh index c68251d..6c60393 100755 --- a/src/languages/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh +++ b/src/projects/node_24_python_3_14_java_24/.devcontainer/scripts/vscode_install.sh @@ -1,12 +1,9 @@ #!/usr/bin/env bash set -e -asdf plugin add python -asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git asdf plugin add java asdf plugin add maven -asdf install python asdf install # install cfn-lint diff --git a/src/languages/node_24_python_3_14_java_24/.trivyignore.yaml b/src/projects/node_24_python_3_14_java_24/.trivyignore.yaml similarity index 100% rename from src/languages/node_24_python_3_14_java_24/.trivyignore.yaml rename to src/projects/node_24_python_3_14_java_24/.trivyignore.yaml diff --git a/src/projects/node_24_python_3_14_java_24/trivy.yaml b/src/projects/node_24_python_3_14_java_24/trivy.yaml new file mode 100644 index 0000000..b4277c5 --- /dev/null +++ b/src/projects/node_24_python_3_14_java_24/trivy.yaml @@ -0,0 +1 @@ +ignorefile: "src/projects/node_24_python_3_14_java_24/.trivyignore_combined.yaml"