build more images

Author: anthony-nhs

.github/workflows/build_multi_arch_image.yml

@@ -2,7 +2,7 @@ name: Build and push docker image
 'on':
   workflow_call:
     inputs:
-      publish_image:
+      tag_latest:
         required: true
         type: boolean
       docker_tag:
@@ -63,6 +63,7 @@ jobs:
           ARCHITECTURE: '${{ matrix.arch }}'
           DOCKER_TAG: '${{ inputs.docker_tag }}'
           CONTAINER_NAME: '${{ inputs.container_name }}'
+          BASE_VERSION: ${{ inputs.docker_tag}}
       - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         name: Upload docker images
         with:
@@ -114,7 +115,6 @@ jobs:
   publish_image:
     needs: build_image
     runs-on: ubuntu-22.04
-    if: ${{ inputs.publish_image }}
     permissions:
       contents: read
       packages: write
@@ -150,33 +150,44 @@ jobs:
               username: ${{github.actor}}
               password: ${{secrets.GITHUB_TOKEN}}
 
-
-      - name: Load and push multi-arch image
+      - name: Load and push multi-arch tagged image
         run: |
           echo "loading images"
           docker load -i "eps-devcontainer-${CONTAINER_NAME}-${DOCKER_TAG}-amd64.img"
           docker load -i "eps-devcontainer-${CONTAINER_NAME}-${DOCKER_TAG}-arm64.img"
 
+          echo "pushing images"
+          docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64"
+          docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64"
+
+          echo "creating manifest"
+          docker manifest create "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}" \
+            --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64" \
+            --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64"
+
+          echo "pushing manifest"
+          docker manifest push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}"
+        env:
+          DOCKER_TAG: ${{ inputs.docker_tag }}
+          CONTAINER_NAME: '${{ inputs.container_name }}'
+
+      - name: Load and push multi-arch latest image
+        if: ${{ inputs.tag_latest }}
+        run: |
           echo "Tagging latest images"
           docker tag "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64" "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-amd64"
           docker tag "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64" "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-arm64"
 
           echo "pushing images"
-          docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64"
-          docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64"
           docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-amd64"
           docker push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-arm64"
 
           echo "creating manifest"
-          docker manifest create "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}" \
-            --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-amd64" \
-            --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}-arm64"
           docker manifest create "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest" \
             --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-amd64" \
             --amend "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest-arm64"
 
           echo "pushing manifest"
-          docker manifest push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:${DOCKER_TAG}"
           docker manifest push "ghcr.io/nhsdigital/eps-devcontainers/${CONTAINER_NAME}:latest"
         env:
           DOCKER_TAG: ${{ inputs.docker_tag }}

.github/workflows/pull_request.yml

@@ -84,12 +84,22 @@ jobs:
           #  echo "commit_id=${{ github.sha }}" >> "$GITHUB_ENV"
           echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
           echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
-  package_docker_image:
+  package_base_docker_image:
     uses: ./.github/workflows/build_multi_arch_image.yml
     needs:
       - get_issue_number
       - get_commit_id
     with:
-      publish_image: true
+      tag_latest: false
       docker_tag: 'pr${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}'
       container_name: base
+  package_node_24_python_3_14_docker_image:
+    uses: ./.github/workflows/build_multi_arch_image.yml
+    needs:
+      - get_issue_number
+      - get_commit_id
+      - package_base_docker_image
+    with:
+      tag_latest: false
+      docker_tag: 'pr${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}'
+      container_name: node_24_python_3_14

.github/workflows/release.yml

@@ -43,6 +43,6 @@ jobs:
     needs: tag_release
     uses: ./.github/workflows/build_multi_arch_image.yml
     with:
-      publish_image: true
+      tag_latest: true
       docker_tag: '${{ needs.tag_release.outputs.version_tag }}'
       container_name: base

Makefile

@@ -17,7 +17,7 @@ install-node:
 install-hooks: install-python
 	poetry run pre-commit install --install-hooks --overwrite
 
-build-image: guard-CONTAINER_NAME
+build-image: guard-CONTAINER_NAME guard-BASE_VERSION
 	npx devcontainer build \
 		--workspace-folder ./src/$${CONTAINER_NAME}/ \
 		--push false \

src/common/Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/nhsdigital/eps-devcontainers/base:latest
+ARG BASE_VERSION=latest
+
+FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION}
 
 # common Dockerfile used to setup poetry after installing python
 

…hon_3.14/.devcontainer/devcontainer.json …hon_3_14/.devcontainer/devcontainer.jsonsrc/node_24_python_3.14/.devcontainer/devcontainer.json renamed to src/node_24_python_3_14/.devcontainer/devcontainer.json src/node_24_python_3.14/.devcontainer/devcontainer.json renamed to src/node_24_python_3_14/.devcontainer/devcontainer.json

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