update to not duplicate feature ref, and fail make config gracefully.

Author: RossBugginsNHS

src/devcontainers/loaded-codespaces/.devcontainer/devcontainer.json

@@ -13,19 +13,13 @@
     "postStartCommand": "echo ${localEnv:CONTAINER_NAME} Started",
 
     "features": {
-        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.25": {}
+        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.26": {}
     },
     "runArgs": [
         "--platform=linux/amd64"
     ],
     "forwardPorts": [
         4000
     ],
-    "remoteUser": "vscode",
-    "containerEnv": {
-        "UPDATEFROMTEMPLATE": "true",
-        "SHOWWELCOME": "true",
-        "MAKECONFIG": "true",
-        "GITHUBMONITOR": "true"
-    }
+    "remoteUser": "vscode"
 }

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

@@ -11,22 +11,15 @@
     },
     "postCreateCommand": "echo ${localEnv:CONTAINER_NAME} Created",
     "postStartCommand": "echo ${localEnv:CONTAINER_NAME} Started",
-    "features": {
-        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.24": {}
-    },
+
     "runArgs": [
         "--platform=linux/amd64"
     ],
     "forwardPorts": [
         4000
     ],
     "remoteUser": "vscode",
-    "containerEnv": {
-        "UPDATEFROMTEMPLATE": "true",
-        "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": [
         {
@@ -54,5 +47,5 @@
             "target": "/home/vscode/.ssh",
             "type": "bind"
         }
-    ],
+    ]
 }

src/features/nhsnotify/devcontainer-feature.json

@@ -1,13 +1,13 @@
 {
     "containerEnv": {
-        "UPDATEFROMTEMPLATE": "true",
-        "SHOWWELCOME": "true",
+        "UPDATEFROMTEMPLATE": "false",
+        "SHOWWELCOME": "false",
         "MAKECONFIG": "true",
-        "GITHUBMONITOR": "true"
+        "GITHUBMONITOR": "false"
     },
     "id": "nhsnotify",
     "name": "NHS Notify",
-    "version": "1.0.25",
+    "version": "1.0.26",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils:2.5.4": {
             "configureZshAsDefaultShell": true,

src/features/nhsnotify/scripts/makeconfig.sh

@@ -9,5 +9,4 @@ fi
 
 echo "running make config"
 export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
-make config
-echo "make config complete"
+make config && echo "make config complete" || echo "make config failed"