fix tags

Author: anthony-nhs

README.md

@@ -86,21 +86,21 @@ You can use these commands to build images
 Base image
 ```
 CONTAINER_NAME=base \
-  BASE_VERSION=latest \
+  BASE_VERSION_TAG=latest \
   BASE_FOLDER=. \
   make build-image
 ``` 
 Language images
 ```
 CONTAINER_NAME=node_24_python_3_12 \
-  BASE_VERSION=latest \
+  BASE_VERSION_TAG=latest \
   BASE_FOLDER=languages \
   make build-image
 ``` 
 Project images
 ```
 CONTAINER_NAME=fhir_facade_api \
-  BASE_VERSION=latest \
+  BASE_VERSION_TAG=latest \
   BASE_FOLDER=projects \
   make build-image
 ``` 

src/base/.devcontainer/Dockerfile

@@ -1,24 +1,25 @@
 FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
 
-ARG BASE_VERSION=latest
-ARG TARGETARCH
 ARG SCRIPTS_DIR=/usr/local/share/eps
 ARG CONTAINER_NAME
 ARG MULTI_ARCH_TAG
-ARG BASE_VERSION
+ARG BASE_VERSION_TAG
 ARG IMAGE_TAG
+ARG TARGETARCH
 
-ENV BASE_VERSION=${BASE_VERSION}
-ENV TARGETARCH=${TARGETARCH}
 ENV SCRIPTS_DIR=${SCRIPTS_DIR}
 ENV CONTAINER_NAME=${CONTAINER_NAME}
 ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG}
-ENV BASE_VERSION=${BASE_VERSION}
+ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
 ENV IMAGE_TAG=${IMAGE_TAG}
+ENV TARGETARCH=${TARGETARCH}
 
 LABEL org.opencontainers.image.source=https://github.com/NHSDigital/eps-devcontainers
 LABEL org.opencontainers.image.description="EPS base devcontainer"
 LABEL org.opencontainers.image.licenses=MIT
+LABEL org.opencontainers.image.version=${IMAGE_TAG}
+LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
+
 
 COPY .tool-versions.asdf ${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
@@ -33,16 +34,6 @@ COPY --chown=vscode:vscode .tool-versions /home/vscode/.tool-versions
 ENV PATH="/home/vscode/.asdf/shims/:$PATH"
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
 RUN ./vscode_install.sh
-RUN rm -rf /home/vscode/.ssh
 
+# Switch back to root to install the devcontainer CLI globally
 USER root
-# store version info in VERSION.txt for reference
-RUN echo "[[ ${CONTAINER_NAME} ]]" > "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BASE_VERSION=${BASE_VERSION}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
-
-USER vscode
-WORKDIR /home/vscode

src/common/Dockerfile

@@ -1,24 +1,28 @@
 ARG BASE_VERSION_TAG=latest
+ARG BASE_IMAGE=ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION_TAG}
 
-FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION_TAG}
+FROM ${BASE_IMAGE}
 
-ARG BASE_VERSION_TAG=latest
-ARG TARGETARCH
 ARG SCRIPTS_DIR=/usr/local/share/eps
 ARG CONTAINER_NAME
 ARG MULTI_ARCH_TAG
+ARG BASE_VERSION_TAG
 ARG IMAGE_TAG
+ARG TARGETARCH
 
-ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
-ENV TARGETARCH=${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.source=https://github.com/NHSDigital/eps-devcontainers
 LABEL org.opencontainers.image.description="EPS ${CONTAINER_NAME} devcontainer"
 LABEL org.opencontainers.image.licenses=MIT
+LABEL org.opencontainers.image.version=${IMAGE_TAG}
+LABEL org.opencontainers.image.baseImage=${BASE_IMAGE}
+LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
 
 USER root
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
@@ -33,16 +37,6 @@ RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions
 ENV PATH="/home/vscode/.asdf/shims/:$PATH"
 
 RUN ./vscode_install.sh
-RUN rm -rf /home/vscode/.ssh
 
+# Switch back to root to install the devcontainer CLI globally
 USER root
-# store version info in VERSION.txt for reference
-RUN echo "[[ ${CONTAINER_NAME} ]]" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BASE_VERSION_TAG=${BASE_VERSION_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
-
-USER vscode
-WORKDIR /home/vscode

src/projects/fhir_facade_api/.devcontainer/Dockerfile

@@ -1,24 +1,28 @@
 ARG BASE_VERSION_TAG=latest
+ARG BASE_IMAGE=ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_13:${BASE_VERSION_TAG}
 
-FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_13:${BASE_VERSION_TAG}
+FROM ${BASE_IMAGE}
 
-ARG BASE_VERSION_TAG=latest
-ARG TARGETARCH
 ARG SCRIPTS_DIR=/usr/local/share/eps
 ARG CONTAINER_NAME
 ARG MULTI_ARCH_TAG
+ARG BASE_VERSION_TAG
 ARG IMAGE_TAG
+ARG TARGETARCH
 
-ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
-ENV TARGETARCH=${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.source=https://github.com/NHSDigital/eps-devcontainers
 LABEL org.opencontainers.image.description="EPS fhir facade devcontainer"
 LABEL org.opencontainers.image.licenses=MIT
+LABEL org.opencontainers.image.version=${IMAGE_TAG}
+LABEL org.opencontainers.image.baseImage=${BASE_IMAGE}
+LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
 
 USER root
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
@@ -32,16 +36,6 @@ COPY .tool-versions /tmp/.tool-versions
 RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions
 
 RUN ./vscode_install.sh
-RUN rm -rf /home/vscode/.ssh
 
+# Switch back to root to install the devcontainer CLI globally
 USER root
-# store version info in VERSION.txt for reference
-RUN echo "[[ ${CONTAINER_NAME} ]]" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BASE_VERSION_TAG=${BASE_VERSION_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
-    echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
-
-USER vscode
-WORKDIR /home/vscode

src/projects/fhir_facade_api/.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
       "dockerfile": "Dockerfile",
       "args": {
         "CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
-        "DOCKER_TAG": "${localEnv:DOCKER_TAG}",
+        "MULTI_ARCH_TAG": "${localEnv:MULTI_ARCH_TAG}",
         "BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
         "IMAGE_TAG": "${localEnv:IMAGE_TAG}"
       },