add labels

Author: anthony-nhs

Makefile

@@ -25,7 +25,8 @@ build-image: guard-CONTAINER_NAME guard-BASE_VERSION guard-BASE_FOLDER
 	npx devcontainer build \
 		--workspace-folder ./src/$${BASE_FOLDER}/$${CONTAINER_NAME} \
 		--push false \
-		--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}${IMAGE_TAG}" 
+		--label "org.opencontainers.image.revision=$$DOCKER_TAG" \
+		--image-name "${CONTAINER_PREFIX}$${CONTAINER_NAME}${IMAGE_TAG}"
 
 scan-image: guard-CONTAINER_NAME guard-BASE_FOLDER
 	@combined="src/$${BASE_FOLDER}/$${CONTAINER_NAME}/.trivyignore_combined.yaml"; \

README.md

@@ -70,7 +70,8 @@ The base image is built first, and then language images, and finally project ima
 
 Docker images are scanned for vulnerabilities using trivy as part of a build step, and the build fails if vulnerabilities are found not in .trivyignore file.
 
-Docker images are also uploaded as artifacts of build.
+For pull requests, images are tagged with the pr-<pull request id>-<short commit sha>.   
+For merges to main, images are tagged with the <short commit sha>
 
 # Release workflow
 There is a release workflow that runs weekly at 18:00 on Thursday and on demand.   

src/base/.devcontainer/Dockerfile

@@ -7,6 +7,10 @@ ARG CONTAINER_NAME
 ENV CONTAINER_NAME=${CONTAINER_NAME}
 ENV SCRIPTS_DIR=${SCRIPTS_DIR}
 
+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
+
 ARG ASDF_VERSION
 COPY .tool-versions.asdf ${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf
 

src/common/Dockerfile

@@ -5,6 +5,10 @@ FROM ghcr.io/nhsdigital/eps-devcontainers/base:${BASE_VERSION}
 ARG CONTAINER_NAME
 ENV CONTAINER_NAME=${CONTAINER_NAME}
 
+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
+
 USER root
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}

src/projects/fhir_facade_api/.devcontainer/Dockerfile

@@ -2,6 +2,10 @@ ARG BASE_VERSION=latest
 
 FROM ghcr.io/nhsdigital/eps-devcontainers/node_24_python_3_13:${BASE_VERSION}
 
+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
+
 USER root
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}