diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9bb7a4ca..c5c86da5 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,67 +1,15 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu
-
-ARG TARGETARCH
-ENV TARGETARCH=${TARGETARCH}
-
-ARG ASDF_VERSION
-COPY .tool-versions.asdf /tmp/.tool-versions.asdf
-
-# Add amd64 architecture if on arm64
-RUN if [ "$TARGETARCH" == "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then dpkg --add-architecture amd64; fi
-
-RUN apt-get update \
- && export DEBIAN_FRONTEND=noninteractive \
- && apt-get -y dist-upgrade \
- && apt-get -y install --no-install-recommends htop vim curl git build-essential \
- libffi-dev libssl-dev libxml2-dev libxslt1-dev libjpeg8-dev libbz2-dev \
- zlib1g-dev unixodbc unixodbc-dev libsecret-1-0 libsecret-1-dev libsqlite3-dev \
- jq apt-transport-https ca-certificates gnupg-agent \
- software-properties-common bash-completion python3-pip make libbz2-dev \
- libreadline-dev libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev \
- xz-utils tk-dev liblzma-dev netcat-traditional libyaml-dev
-
-# Download correct AWS CLI for arch
-RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
- wget -O /tmp/awscliv2.zip "https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip"; \
- else \
- wget -O /tmp/awscliv2.zip "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"; \
- fi && \
- unzip /tmp/awscliv2.zip -d /tmp/aws-cli && \
- /tmp/aws-cli/aws/install && \
- rm /tmp/awscliv2.zip && rm -rf /tmp/aws-cli
-
-# Install ASDF
-RUN ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' /tmp/.tool-versions.asdf) && \
- if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
- wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-arm64.tar.gz"; \
+ARG IMAGE_NAME=node_24_python_3_14
+ARG IMAGE_VERSION=latest
+FROM ghcr.io/nhsdigital/eps-devcontainers/${IMAGE_NAME}:${IMAGE_VERSION}
+
+USER root
+# specify DOCKER_GID to force container docker group id to match host
+RUN if [ -n "${DOCKER_GID}" ]; then \
+ if ! getent group docker; then \
+ groupadd -g ${DOCKER_GID} docker; \
else \
- wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-amd64.tar.gz"; \
+ groupmod -g ${DOCKER_GID} docker; \
fi && \
- tar -xzf /tmp/asdf.tar.gz -C /tmp && \
- mkdir -p /usr/bin && \
- mv /tmp/asdf /usr/bin/asdf && \
- chmod +x /usr/bin/asdf && \
- rm -rf /tmp/asdf.tar.gz
-
-USER vscode
-
-
-ENV PATH="$PATH:/home/vscode/.asdf/shims/:/workspaces/eps-vpc-resources/node_modules/.bin"
-
-
-# Install ASDF plugins
-RUN asdf plugin add python; \
- asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git; \
- asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git; \
- asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git; \
- asdf plugin add direnv; \
- asdf plugin add actionlint; \
- asdf plugin add ruby https://github.com/asdf-vm/asdf-ruby.git
-
-
-WORKDIR /workspaces/eps-vpc-resources
-ADD .tool-versions /workspaces/eps-resources/.tool-versions
-ADD .tool-versions /home/vscode/.tool-versions
-
-RUN asdf install python; \
- asdf install
+ usermod -aG docker vscode; \
+ fi
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 943749f9..f0213845 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,13 +1,17 @@
-// 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": "Ubuntu",
- // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+ "name": "eps-vpc-resources",
"build": {
"dockerfile": "Dockerfile",
"context": "..",
- "args": {}
+ "args": {
+ "DOCKER_GID": "${env:DOCKER_GID:}",
+ "IMAGE_NAME": "node_24_python_3_14",
+ "IMAGE_VERSION": "v1.0.7",
+ "USER_UID": "${localEnv:USER_ID:}",
+ "USER_GID": "${localEnv:GROUP_ID:}"
+ }
},
+ "postAttachCommand": "git-secrets --register-aws; git-secrets --add-provider -- cat /usr/share/secrets-scanner/nhsd-rules-deny.txt",
"mounts": [
"source=${env:HOME}${env:USERPROFILE}/.aws,target=/home/vscode/.aws,type=bind",
"source=${env:HOME}${env:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
@@ -15,11 +19,6 @@
"source=${env:HOME}${env:USERPROFILE}/.npmrc,target=/home/vscode/.npmrc,type=bind"
],
"features": {
- "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
- "version": "latest",
- "moby": "true",
- "installDockerBuildx": "true"
- }
},
"customizations": {
"vscode": {
@@ -51,12 +50,17 @@
"python.testing.pytestEnabled": true,
"pylint.enabled": false,
"python.linting.flake8Enabled": true,
- "python.linting.enabled": true, // required to format on save
- "editor.formatOnPaste": false, // required
- "editor.formatOnType": false, // required
- "editor.formatOnSave": true, // optional
+ "python.linting.enabled": true,
+ "editor.formatOnPaste": false,
+ "editor.formatOnType": false,
+ "editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
- "cSpell.words": ["fhir", "Formik", "pino", "serialisation"],
+ "cSpell.words": [
+ "fhir",
+ "Formik",
+ "pino",
+ "serialisation"
+ ],
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
@@ -67,15 +71,7 @@
}
}
},
- "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
- "postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/eps-vpc-resources; make install; direnv allow ."
- // "features": {},
- // Use 'forwardPorts' to make a list of ports inside the container available locally.
- // "forwardPorts": [],
- // Use 'postCreateCommand' to run commands after the container is created.
- // "postCreateCommand": ""
- // Configure tool-specific properties.
- // "customizations": {},
- // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
- // "remoteUser": "root"
+ "remoteEnv": {
+ "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
+ }
}
diff --git a/.github/scripts/describe_cdk_changes.sh b/.github/scripts/describe_cdk_changes.sh
new file mode 100755
index 00000000..6c905409
--- /dev/null
+++ b/.github/scripts/describe_cdk_changes.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+{
+ echo "$SUMMARY
"
+ echo ""
+ echo "- **Stack Name:** $STACK_NAME"
+ echo ""
+ echo "#### Changes:"
+ echo "~~~ text"
+ cat "$DIFF_FILE"
+ echo "~~~"
+ echo "