build lots of images

Author: anthony-nhs

.github/workflows/build_all_images.yml

@@ -31,3 +31,16 @@ jobs:
       tag_latest: ${{ inputs.tag_latest }}
       docker_tag: ${{ inputs.docker_tag }}
       container_name: ${{ matrix.container_name }}
+  package_product_docker_image:
+    needs:
+      - package_non_base_docker_image
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - container_name: cpt_api
+    uses: ./.github/workflows/build_multi_arch_image.yml
+    with:
+      tag_latest: ${{ inputs.tag_latest }}
+      docker_tag: ${{ inputs.docker_tag }}
+      container_name: ${{ matrix.container_name }}

Makefile

@@ -37,6 +37,11 @@ scan-image: guard-CONTAINER_NAME
 		--exit-code 1 \
 		--format table "${CONTAINER_PREFIX}$${CONTAINER_NAME}" 
 
+shell-image: guard-CONTAINER_NAME
+	docker run -it \
+	"${CONTAINER_PREFIX}$${CONTAINER_NAME}"  \
+	bash
+
 lint: lint-githubactions
 
 test:

src/base/.devcontainer/Dockerfile

@@ -2,13 +2,13 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
 
 ARG TARGETARCH
 ENV TARGETARCH=${TARGETARCH}
-ARG SCRIPTS_DIR=/usr/local/share/eps/
+ARG SCRIPTS_DIR=/usr/local/share/eps
 ARG CONTAINER_NAME
 ENV CONTAINER_NAME=${CONTAINER_NAME}
 ENV SCRIPTS_DIR=${SCRIPTS_DIR}
 
 ARG ASDF_VERSION
-COPY .tool-versions.asdf /tmp/.tool-versions.asdf
+COPY .tool-versions.asdf ${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf
 
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
@@ -18,8 +18,8 @@ USER vscode
 
 ENV PATH="/home/vscode/.asdf/shims/:$PATH"
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
-COPY .tool-versions.asdf /home/vscode/.tool-versions.asdf
-COPY .tool-versions /home/vscode/.tool-versions
+COPY --chown=vscode:vscode .tool-versions.asdf /home/vscode/.tool-versions.asdf
+COPY --chown=vscode:vscode .tool-versions /home/vscode/.tool-versions
 
 RUN ./vscode_install.sh
 WORKDIR /home/vscode

src/base/.devcontainer/devcontainer.json

@@ -5,7 +5,9 @@
     // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
     "build": {
       "dockerfile": "Dockerfile",
-      "args": {}
+      "args": {
+        "CONTAINER_NAME": "eps_devcontainer_base"
+      }
     },
     "runArgs": [
       "--network=host"

src/base/.devcontainer/scripts/root_install.sh

@@ -30,19 +30,6 @@ apt-get -y install --no-install-recommends htop vim curl git build-essential \
     libreadline-dev libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev liblzma-dev netcat-traditional libyaml-dev uuid-runtime xxd unzip
 
-# install aws stuff
-# Download correct AWS CLI for arch
-# echo "Installing aws cli"
-# if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then
-#       wget -O /tmp/awscliv2.zip --no-verbose "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip"
-#     else
-#       wget -O /tmp/awscliv2.zip --no-verbose "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"
-#     fi
-#     unzip -q /tmp/awscliv2.zip -d /tmp/aws-cli
-#     /tmp/aws-cli/aws/install
-#     rm /tmp/awscliv2.zip
-#     rm -rf /tmp/aws-cli
-
 # Download correct SAM CLI for arch
 echo "Installing aws-sam cli"
 if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "aarch64" ]; then
@@ -57,7 +44,7 @@ if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "aarch64" ]; then
 
 # Install ASDF
 echo "Installing asdf"
-ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' /tmp/.tool-versions.asdf)
+ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' "${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf")
 if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then
     wget -O /tmp/asdf.tar.gz --no-verbose "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-arm64.tar.gz"
 else

src/common/Dockerfile

@@ -2,10 +2,19 @@ ARG BASE_VERSION=latest
 
 FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION}
 
-# common Dockerfile used to setup poetry after installing python
+ARG CONTAINER_NAME
+ENV CONTAINER_NAME=${CONTAINER_NAME}
 
-ARG POETRY_VERSION=2.3.2
+USER root
+COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
+WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
+RUN ./root_install.sh
 
-RUN curl -sSL https://install.python-poetry.org | python3 - --version ${POETRY_VERSION}
+USER vscode
 
-ENV PATH="/home/vscode/.local/bin:${PATH}"
+WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
+COPY .tool-versions /tmp/.tool-versions
+RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions
+
+RUN ./vscode_install.sh
+WORKDIR /home/vscode

src/cpt_api/.devcontainer/.tool-versions

@@ -0,0 +1,3 @@
+ARG BASE_VERSION=latest
+
+FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION}

src/cpt_api/.devcontainer/Dockerfile

@@ -0,0 +1,20 @@
+// 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.13",
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "build": {
+      "dockerfile": "Dockerfile",
+      "args": {
+        "BASE_VERSION": "${localEnv:BASE_VERSION}",
+        "CONTAINER_NAME": "cpt_api"
+      },
+      "context": "."
+    },
+    "runArgs": [
+      "--network=host"
+    ],
+    "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
+    "features": {}
+  }
+  

src/cpt_api/.devcontainer/devcontainer.json

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+set -e