Codespaces version.

Author: RossBugginsNHS

.github/workflows/cicd.yaml

@@ -97,10 +97,12 @@ jobs:
           - container_name: default
             title: NHS Notifiy Devcontainer Default Image
             description: Default development container for NHS Notify projects
+          - container_name: loaded-codespaces
+            title: NHS Notifiy Devcontainer Loaded Image
+            description: Loaded development container for NHS Notify projects for codespace development
           - container_name: loaded
             title: NHS Notifiy Devcontainer Loaded Image
-            description: Loaded development container for NHS Notify projects
-
+            description: Loaded development container for NHS Notify projects for local development including useful local bind mounts
     permissions:
       contents: read
       packages: write

…rs/loaded-local/.devcontainer/Dockerfile …aded-codespaces/.devcontainer/Dockerfilesrc/devcontainers/loaded-local/.devcontainer/Dockerfile renamed to src/devcontainers/loaded-codespaces/.devcontainer/Dockerfile src/devcontainers/loaded-local/.devcontainer/Dockerfile renamed to src/devcontainers/loaded-codespaces/.devcontainer/Dockerfile

@@ -16,7 +16,7 @@ RUN test -n ${CONTAINER_NAME}
 RUN test -n ${BASE_IMAGE_TAG}
 RUN test -n ${BASE_CONTAINER_PREFIX}
 
-ENV LOADED_LOCAL_IMAGE_TAG=${BASE_IMAGE_TAG}
+ENV LOADED_CODESPACES_IMAGE_TAG=${BASE_IMAGE_TAG}
 
 COPY scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}

…ed-local/.devcontainer/devcontainer.json …despaces/.devcontainer/devcontainer.jsonsrc/devcontainers/loaded-local/.devcontainer/devcontainer.json renamed to src/devcontainers/loaded-codespaces/.devcontainer/devcontainer.json src/devcontainers/loaded-local/.devcontainer/devcontainer.json renamed to src/devcontainers/loaded-codespaces/.devcontainer/devcontainer.json

@@ -11,8 +11,9 @@
     },
     "postCreateCommand": "echo ${localEnv:CONTAINER_NAME} Created",
     "postStartCommand": "echo ${localEnv:CONTAINER_NAME} Started",
+
     "features": {
-        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.24": {}
+        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.25": {}
     },
     "runArgs": [
         "--platform=linux/amd64"
@@ -26,33 +27,5 @@
         "SHOWWELCOME": "true",
         "MAKECONFIG": "true",
         "GITHUBMONITOR": "true"
-    },
-    "initializeCommand": "touch $HOME/.gitconfig || true && mkdir -p $HOME/.aws || true && mkdir -p $HOME/.gnupg || true && mkdir -p $HOME/.ssh || true",
-    "mounts": [
-        {
-            "source": "/usr/local/share/ca-certificates",
-            "target": "/home/ca-certificates",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.aws",
-            "target": "/home/vscode/.aws",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.gitconfig",
-            "target": "/home/vscode/.gitconfig",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.gnupg",
-            "target": "/home/vscode/.gnupg",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.ssh",
-            "target": "/home/vscode/.ssh",
-            "type": "bind"
-        }
-    ],
+    }
 }

src/devcontainers/loaded-codespaces/.devcontainer/scripts/install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "Starting NHS Notify loaded codespaces container installation script"
+
+echo "Finished NHS Notify loaded codespaces container installation script"

src/devcontainers/loaded-local/Makefile …devcontainers/loaded-codespaces/Makefilesrc/devcontainers/loaded-local/Makefile renamed to src/devcontainers/loaded-codespaces/Makefile src/devcontainers/loaded-local/Makefile renamed to src/devcontainers/loaded-codespaces/Makefile

@@ -1,7 +1,7 @@
 CONTAINER_PREFIX=ghcr.io/nhsdigital/nhs-notify-devcontainer-
-CONTAINER_NAME=loaded-local
+CONTAINER_NAME=loaded-codespaces
 BASE_CONTAINER_PREFIX=$(CONTAINER_PREFIX)
-BASE_CONTAINER_NAME=loaded
+BASE_CONTAINER_NAME=default
 BASE_IMAGE_TAG=latest
 IMAGE_NAME=${CONTAINER_PREFIX}$(CONTAINER_NAME)
 WORKSPACE_FOLDER=.

src/devcontainers/loaded-local/README.md …evcontainers/loaded-codespaces/README.mdsrc/devcontainers/loaded-local/README.md renamed to src/devcontainers/loaded-codespaces/README.md src/devcontainers/loaded-local/README.md renamed to src/devcontainers/loaded-codespaces/README.md

@@ -7,7 +7,7 @@
     },
     "id": "nhsnotify",
     "name": "NHS Notify",
-    "version": "1.0.24",
+    "version": "1.0.25",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils:2.5.4": {
             "configureZshAsDefaultShell": true,
@@ -26,33 +26,6 @@
     "postStartCommand": [
         "/usr/local/share/nhsnotify/scripts/poststartcommand.sh"
     ],
-    "mounts": [
-        {
-            "source": "/usr/local/share/ca-certificates",
-            "target": "/home/ca-certificates",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.aws",
-            "target": "/home/vscode/.aws",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.gitconfig",
-            "target": "/home/vscode/.gitconfig",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.gnupg",
-            "target": "/home/vscode/.gnupg",
-            "type": "bind"
-        },
-        {
-            "source": "${localEnv:HOME}/.ssh",
-            "target": "/home/vscode/.ssh",
-            "type": "bind"
-        }
-    ],
     "customizations": {
         "vscode": {
             "extensions": [