separate into 3.

Author: RossBugginsNHS

.github/workflows/cicd.yaml

@@ -68,6 +68,10 @@ jobs:
             image: nhsdigital/nhs-notify-devcontainer-base
             title: NHS Notifiy Devcontainer Base Image
             description: Base development container for NHS Notify projects
+          - container_name: default
+            image: nhsdigital/nhs-notify-devcontainer-default
+            title: NHS Notifiy Devcontainer Default Image
+            description: Default development container for NHS Notify projects
           - container_name: loaded
             image: nhsdigital/nhs-notify-devcontainer-loaded
             title: NHS Notifiy Devcontainer Loaded Image

src/devcontainers/default/.devcontainer/devcontainer.json

@@ -0,0 +1,46 @@
+{
+    "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-base:latest",
+    "features": {
+        "ghcr.io/devcontainers/features/python:1.7.1": {
+            "version": "3.13.8",
+            "installTools": true
+        },
+        "ghcr.io/devcontainers/features/aws-cli:1.1.2": {
+            "version": "2.31.18"
+        },
+        "ghcr.io/devcontainers/features/common-utils:2.5.4": {
+            "configureZshAsDefaultShell": true,
+            "installOhMyZsh": true,
+            "installOhMyZshConfig": true,
+            "installZsh": true,
+            "upgradePackages": true,
+            "userGid": "automatic",
+            "userUid": "automatic",
+            "username": "automatic"
+        },
+        "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {
+            "azureDnsAutoDetection": true,
+            "dockerDashComposeVersion": "2.40.1",
+            "installDockerBuildx": true,
+            "installDockerComposeSwitch": true,
+            "moby": true,
+            "version": "28.5.1"
+        },
+        "ghcr.io/devcontainers/features/github-cli:1.0.15": {
+            "installDirectlyFromGitHubRelease": true,
+            "version": "2.82.0"
+        },
+        "ghcr.io/devcontainers/features/node:1.6.3": {
+            "nodeGypDependencies": true,
+            "nvmVersion": "0.40.3",
+            "version": "22.21.0"
+        },
+        "ghcr.io/devcontainers/features/ruby:1.3.2": {
+            "version": "3.4.7"
+        },
+        "ghcr.io/devcontainers/features/go:1.3.2": {
+            "version": "1.25.3"
+        }
+    },
+    "name": "NHS Notify Default Developer Container"
+}

src/devcontainers/default/.tool-versions

@@ -0,0 +1 @@
+nodejs 22.11.0

src/devcontainers/default/Makefile

@@ -0,0 +1,12 @@
+IMAGE_NAME = ghcr.io/nhsdigital/nhs-notify-devcontainer-default
+WORKSPACE_FOLDER = .
+
+build:
+	npm install -g @devcontainers/cli && \
+	BUILDKIT_PROGRESS=plain \
+	devcontainer build \
+	--push false \
+	--workspace-folder $(WORKSPACE_FOLDER) \
+	--image-name "$(IMAGE_NAME)" \
+	--label "devcontainer.metadata=[{\"containerEnv\": { \"CUSTOM_VARIABLE\": \"Testing a variable\" }}]"
+

src/devcontainers/default/README.md

@@ -1,5 +1,5 @@
 {
-    "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-base:latest",
+    "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-default:latest",
     "features": {
         "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0": {
             "updateFromTemplate": true,

src/devcontainers/loaded/.devcontainer/devcontainer.json

@@ -3,51 +3,9 @@
         "UPDATEFROMTEMPLATE": "true",
         "SHOWWELCOME": "true"
     },
-    "dependsOn": {
-        "ghcr.io/devcontainers/features/python:1.7.1": {
-            "version": "3.13.8",
-            "installTools": true
-        },
-        "ghcr.io/devcontainers/features/aws-cli:1.1.2": {
-            "version": "2.31.18"
-        },
-        "ghcr.io/devcontainers/features/common-utils:2.5.4": {
-            "configureZshAsDefaultShell": true,
-            "installOhMyZsh": true,
-            "installOhMyZshConfig": true,
-            "installZsh": true,
-            "upgradePackages": true,
-            "userGid": "automatic",
-            "userUid": "automatic",
-            "username": "automatic"
-        },
-        "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {
-            "azureDnsAutoDetection": true,
-            "dockerDashComposeVersion": "2.40.1",
-            "installDockerBuildx": true,
-            "installDockerComposeSwitch": true,
-            "moby": true,
-            "version": "28.5.1"
-        },
-        "ghcr.io/devcontainers/features/github-cli:1.0.15": {
-            "installDirectlyFromGitHubRelease": true,
-            "version": "2.82.0"
-        },
-        "ghcr.io/devcontainers/features/node:1.6.3": {
-            "nodeGypDependencies": true,
-            "nvmVersion": "0.40.3",
-            "version": "22.21.0"
-        },
-        "ghcr.io/devcontainers/features/ruby:1.3.2": {
-            "version": "3.4.7"
-        },
-        "ghcr.io/devcontainers/features/go:1.3.2": {
-            "version": "1.25.3"
-        }
-    },
     "id": "nhsnotify",
     "name": "NHS Notify",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "postCreateCommand": "echo 'NHS Notify FEATURE: Post Create Command'"
 
 }