move files to get more re-use

Author: anthony-nhs

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

src/languages/node_24_python_3_14_golang_1_24/trivy.yaml

@@ -1,4 +1,2 @@
-python 3.14.3
-poetry 2.3.2
 golang 1.24.13
 golangci-lint 2.11.3

src/languages/node_24_python_3_14_java_24/trivy.yaml

@@ -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

…golang_1_24/.devcontainer/.tool-versions …golang_1_24/.devcontainer/.tool-versionssrc/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions renamed to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions src/languages/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions renamed to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/.tool-versions

@@ -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}",

src/projects/node_24_python_3_14_golang_1_24/.devcontainer/Dockerfile

@@ -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

…_java_24/.devcontainer/devcontainer.json …ang_1_24/.devcontainer/devcontainer.jsonsrc/languages/node_24_python_3_14_java_24/.devcontainer/devcontainer.json renamed to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json src/languages/node_24_python_3_14_java_24/.devcontainer/devcontainer.json renamed to src/projects/node_24_python_3_14_golang_1_24/.devcontainer/devcontainer.json

@@ -0,0 +1 @@
+ignorefile: "src/projects/node_24_python_3_14_golang_1_24/.trivyignore_combined.yaml"