force platform

Author: anthony-nhs

.github/workflows/build_multi_arch_image.yml

@@ -72,6 +72,7 @@ jobs:
           DOCKER_TAG: '${{ inputs.docker_tag }}'
           CONTAINER_NAME: '${{ inputs.container_name }}'
           BASE_VERSION: ${{ inputs.docker_tag}}
+          PLATFORM: linux/${{ matrix.arch }}
       - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
         name: Upload combined trivy ignore file
         with:

Makefile

@@ -1,5 +1,9 @@
 CONTAINER_PREFIX=ghcr.io/nhsdigital/eps-devcontainers/
 
+ifneq ($(strip $(PLATFORM)),)
+PLATFORM_FLAG=--platform $(PLATFORM)
+endif
+
 guard-%:
 	@ if [ "${${*}}" = "" ]; then \
 		echo "Environment variable $* not set"; \
@@ -17,10 +21,11 @@ install-node:
 install-hooks: install-python
 	poetry run pre-commit install --install-hooks --overwrite
 
-build-image: guard-CONTAINER_NAME guard-BASE_VERSION
+build-image: guard-CONTAINER_NAME guard-BASE_VERSION guard-PLATFORM
 	npx devcontainer build \
 		--workspace-folder ./src/$${CONTAINER_NAME}/ \
 		--push false \
+		--platform $${PLATFORM} \
 		--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}" 
 
 scan-image: guard-CONTAINER_NAME