Skip to content

Commit 8402b54

Browse files
anthony-nhsanthony-nhs
committed
more info to container
1 parent 82b374a commit 8402b54

9 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎.github/workflows/build_multi_arch_image.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ jobs:
8383
env:
8484
ARCHITECTURE: '${{ matrix.arch }}'
8585
CONTAINER_NAME: '${{ inputs.container_name }}'
86-
DOCKER_TAG: '${{ inputs.docker_tag }}'
87-
BASE_VERSION: ${{ inputs.docker_tag}}
86+
MULTI_ARCH_TAG: '${{ inputs.docker_tag }}'
87+
BASE_VERSION_TAG: ${{ inputs.docker_tag}}
8888
IMAGE_TAG: ":${{ inputs.docker_tag }}-${{ matrix.arch }}"
8989
BASE_FOLDER: "${{ inputs.base_folder }}"
9090
- name: Check docker vulnerabilities - json output

‎src/base/.devcontainer/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ ARG BASE_VERSION=latest
44
ARG TARGETARCH
55
ARG SCRIPTS_DIR=/usr/local/share/eps
66
ARG CONTAINER_NAME
7-
ARG DOCKER_TAG
7+
ARG MULTI_ARCH_TAG
88
ARG BASE_VERSION
99
ARG IMAGE_TAG
1010

1111
ENV BASE_VERSION=${BASE_VERSION}
1212
ENV TARGETARCH=${TARGETARCH}
1313
ENV SCRIPTS_DIR=${SCRIPTS_DIR}
1414
ENV CONTAINER_NAME=${CONTAINER_NAME}
15-
ENV DOCKER_TAG=${DOCKER_TAG}
15+
ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG}
1616
ENV BASE_VERSION=${BASE_VERSION}
1717
ENV IMAGE_TAG=${IMAGE_TAG}
1818

@@ -39,8 +39,9 @@ USER root
3939
# store version info in VERSION.txt for reference
4040
RUN echo "[[ ${CONTAINER_NAME} ]]" > "${SCRIPTS_DIR}/VERSION.txt" && \
4141
echo "BASE_VERSION=${BASE_VERSION}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
42-
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
42+
echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4343
echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
44+
echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4445
echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
4546

4647
USER vscode

‎src/common/Dockerfile‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
ARG BASE_VERSION=latest
1+
ARG BASE_VERSION_TAG=latest
22

3-
FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION}
3+
FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION_TAG}
44

5-
ARG BASE_VERSION=latest
5+
ARG BASE_VERSION_TAG=latest
66
ARG TARGETARCH
77
ARG SCRIPTS_DIR=/usr/local/share/eps
88
ARG CONTAINER_NAME
9-
ARG DOCKER_TAG
10-
ARG BASE_VERSION
9+
ARG MULTI_ARCH_TAG
1110
ARG IMAGE_TAG
1211

13-
ENV BASE_VERSION=${BASE_VERSION}
12+
ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
1413
ENV TARGETARCH=${TARGETARCH}
1514
ENV SCRIPTS_DIR=${SCRIPTS_DIR}
1615
ENV CONTAINER_NAME=${CONTAINER_NAME}
17-
ENV DOCKER_TAG=${DOCKER_TAG}
18-
ENV BASE_VERSION=${BASE_VERSION}
16+
ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG}
1917
ENV IMAGE_TAG=${IMAGE_TAG}
2018

2119
LABEL org.opencontainers.image.source=https://github.com/NHSDigital/eps-devcontainers
@@ -40,9 +38,10 @@ RUN rm -rf /home/vscode/.ssh
4038
USER root
4139
# store version info in VERSION.txt for reference
4240
RUN echo "[[ ${CONTAINER_NAME} ]]" >> "${SCRIPTS_DIR}/VERSION.txt" && \
43-
echo "BASE_VERSION=${BASE_VERSION}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
44-
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
41+
echo "BASE_VERSION_TAG=${BASE_VERSION_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
42+
echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4543
echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
44+
echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4645
echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
4746

4847
USER vscode

‎src/languages/node_24_python_3_12/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"args": {
99
"CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
1010
"DOCKER_TAG": "${localEnv:DOCKER_TAG}",
11-
"BASE_VERSION": "${localEnv:BASE_VERSION}",
11+
"BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
1212
"IMAGE_TAG": "${localEnv:IMAGE_TAG}"
1313
},
1414
"context": "."

‎src/languages/node_24_python_3_13/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"args": {
99
"CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
1010
"DOCKER_TAG": "${localEnv:DOCKER_TAG}",
11-
"BASE_VERSION": "${localEnv:BASE_VERSION}",
11+
"BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
1212
"IMAGE_TAG": "${localEnv:IMAGE_TAG}"
1313
},
1414
"context": "."

‎src/languages/node_24_python_3_14/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"args": {
99
"CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
1010
"DOCKER_TAG": "${localEnv:DOCKER_TAG}",
11-
"BASE_VERSION": "${localEnv:BASE_VERSION}",
11+
"BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
1212
"IMAGE_TAG": "${localEnv:IMAGE_TAG}"
1313
},
1414
"context": "."

‎src/languages/python_3_10/.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
33
{
4-
"name": "EPS Devcontainer node_24 python_3.13",
4+
"name": "EPS Devcontainer node_24 python_3.10",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
66
"build": {
77
"dockerfile": "../../../common/Dockerfile",
88
"args": {
99
"CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
1010
"DOCKER_TAG": "${localEnv:DOCKER_TAG}",
11-
"BASE_VERSION": "${localEnv:BASE_VERSION}",
11+
"BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
1212
"IMAGE_TAG": "${localEnv:IMAGE_TAG}"
1313
},
1414
"context": "."

‎src/projects/fhir_facade_api/.devcontainer/Dockerfile‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
ARG BASE_VERSION=latest
1+
ARG BASE_VERSION_TAG=latest
22

3-
FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_13:${BASE_VERSION}
3+
FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_13:${BASE_VERSION_TAG}
44

5-
ARG BASE_VERSION=latest
5+
ARG BASE_VERSION_TAG=latest
66
ARG TARGETARCH
77
ARG SCRIPTS_DIR=/usr/local/share/eps
88
ARG CONTAINER_NAME
9-
ARG DOCKER_TAG
10-
ARG BASE_VERSION
9+
ARG MULTI_ARCH_TAG
1110
ARG IMAGE_TAG
1211

13-
ENV BASE_VERSION=${BASE_VERSION}
12+
ENV BASE_VERSION_TAG=${BASE_VERSION_TAG}
1413
ENV TARGETARCH=${TARGETARCH}
1514
ENV SCRIPTS_DIR=${SCRIPTS_DIR}
1615
ENV CONTAINER_NAME=${CONTAINER_NAME}
17-
ENV DOCKER_TAG=${DOCKER_TAG}
18-
ENV BASE_VERSION=${BASE_VERSION}
16+
ENV MULTI_ARCH_TAG=${MULTI_ARCH_TAG}
1917
ENV IMAGE_TAG=${IMAGE_TAG}
2018

2119
LABEL org.opencontainers.image.source=https://github.com/NHSDigital/eps-devcontainers
@@ -39,9 +37,10 @@ RUN rm -rf /home/vscode/.ssh
3937
USER root
4038
# store version info in VERSION.txt for reference
4139
RUN echo "[[ ${CONTAINER_NAME} ]]" >> "${SCRIPTS_DIR}/VERSION.txt" && \
42-
echo "BASE_VERSION=${BASE_VERSION}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
43-
echo "DOCKER_TAG=${DOCKER_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
40+
echo "BASE_VERSION_TAG=${BASE_VERSION_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
41+
echo "MULTI_ARCH_TAG=${MULTI_ARCH_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4442
echo "IMAGE_TAG=${IMAGE_TAG}" >> "${SCRIPTS_DIR}/VERSION.txt" && \
43+
echo "BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "${SCRIPTS_DIR}/VERSION.txt" && \
4544
echo "" >> "${SCRIPTS_DIR}/VERSION.txt"
4645

4746
USER vscode

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"args": {
99
"CONTAINER_NAME": "eps_devcontainer_${localEnv:CONTAINER_NAME}",
1010
"DOCKER_TAG": "${localEnv:DOCKER_TAG}",
11-
"BASE_VERSION": "${localEnv:BASE_VERSION}",
11+
"BASE_VERSION_TAG": "${localEnv:BASE_VERSION_TAG}",
1212
"IMAGE_TAG": "${localEnv:IMAGE_TAG}"
1313
},
1414
"context": "."

0 commit comments

Comments
 (0)