env vars

Author: RossBugginsNHS

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

@@ -1,7 +1,7 @@
 {
     "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-base:latest",
     "features": {
-        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0.1": {
+        "ghcr.io/nhsdigital/nhs-notify-devcontainers/nhsnotify:1.0": {
             "updateFromTemplate": true,
             "showWelcome": true
         }
@@ -12,5 +12,10 @@
     "forwardPorts": [
         4000
     ],
-    "name": "NHS Notify Fully Loaded Developer Container"
+    "name": "NHS Notify Fully Loaded Developer Container",
+
+    "containerEnv": {
+        "UPDATEFROMTEMPLATE": "true",
+        "SHOWWELCOME": "true"
+    }
 }

src/devcontainers/loaded/Makefile

@@ -7,4 +7,7 @@ build:
 	devcontainer build \
 	--push false \
 	--workspace-folder $(WORKSPACE_FOLDER) \
-	--image-name "$(IMAGE_NAME)"
+	--image-name "$(IMAGE_NAME)" \
+	--no-cache \
+	--label "devcontainer.metadata=[{\"containerEnv\": { \"CUSTOM_VARIABLE\": \"Testing a variable\" }}]"
+

src/features/nhsnotify/devcontainer-feature.json

@@ -1,4 +1,8 @@
 {
+    "containerEnv": {
+        "UPDATEFROMTEMPLATE": "true",
+        "SHOWWELCOME": "true"
+    },
     "dependsOn": {
         "ghcr.io/devcontainers/features/python:1.7.1": {
             "version": "3.13.8",
@@ -45,7 +49,7 @@
     "name": "NHS Notify",
     "postCreateCommand": "zsh /usr/local/share/nhsnotify/scripts/postcreatecommand.sh",
     "postStartCommand": "zsh /usr/local/share/nhsnotify/scripts/poststartcommand.sh",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "customizations": {
         "vscode": {
             "extensions": [
@@ -99,18 +103,6 @@
             }
         }
     },
-    "options": {
-        "updateFromTemplate": {
-            "type": "boolean",
-            "description": "Update from template",
-            "default": true
-        },
-        "showWelcome": {
-            "type": "boolean",
-            "description": "Show welcome message",
-            "default": true
-        }
-    },
     "mounts": [
         {
             "source": "/usr/local/share/ca-certificates",

src/features/nhsnotify/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+SHARE_DIR="/usr/local/share/nhsnotify"
 
 add_asdf_to_path(){
     echo "adding asdf to path"
@@ -8,7 +9,7 @@ add_asdf_to_path(){
 
 echo "Starting NHS Notify feature installation script"
 
-SHARE_DIR="/usr/local/share/nhsnotify"
+
 echo "Share dir is $SHARE_DIR"
 mkdir -p $SHARE_DIR
 cp -r ./scripts $SHARE_DIR
@@ -24,5 +25,10 @@ echo "APT packages configured"
 echo "go is at $(which go)"
 echo 'install asdf via go'
 go install github.com/asdf-vm/asdf/cmd/[email protected]
+
+
 add_asdf_to_path
+
+
+
 echo "Finished NHS Notify feature installation script"

src/features/nhsnotify/scripts/postcreatecommand.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 CURRENT_DIR=$(pwd)
+
+echo "Starting post create command script"
+echo "Update from template variable is set to: ${UPDATEFROMTEMPLATE}"
 update_from_template="${UPDATEFROMTEMPLATE:-true}"
 
 REPO=https://github.com/NHSDigital/nhs-notify-repository-template.git

src/features/nhsnotify/scripts/welcome.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Check if SHOWWELCOME is set to true, exit if not
+echo "Show welcome variable is set to: ${SHOWWELCOME}"
 show_welcome="${SHOWWELCOME:-true}"
 if [ "${show_welcome}" != "true" ]; then
     exit 0