updated start.

Author: RossBugginsNHS

src/devcontainers/base/src/.devcontainer/devcontainer.json

@@ -57,9 +57,9 @@
     },
     "features": {
 
-        "ghcr.io/devcontainers/features/aws-cli:1": {
-            "version": "latest"
-        },
+        // "ghcr.io/devcontainers/features/aws-cli:1": {
+        //     "version": "latest"
+        // },
         "ghcr.io/devcontainers/features/common-utils:2": {
             "configureZshAsDefaultShell": true,
             "installOhMyZsh": true,
@@ -87,14 +87,11 @@
             "nvmVersion": "latest",
             "version": "lts"
         },
-        "ghcr.io/devcontainers/features/ruby:1": {
-            "version": "latest"
-        },
+        // "ghcr.io/devcontainers/features/ruby:1": {
+        //     "version": "latest"
+        // },
         "ghcr.io/devcontainers/features/go:1": {
             "version": "latest"
-        },
-        "ghcr.io/devcontainer-community/devcontainer-features/asdf-vm.com:1": {
-            "version": "latest"
         },
            "./nhsnotify": {
             "version": "1.0.1"
@@ -106,5 +103,13 @@
     "name": "NHS Notify Default Developer Container",
     "runArgs": [
         "--platform=linux/amd64"
+    ],
+    "initializeCommand": "./scripts/init.sh",
+    "mounts": [
+        "source=/usr/local/share/ca-certificates,target=/home/ca-certificates,type=bind,consistency=cached",
+        "source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached",
+        "source=${localEnv:HOME}/.gitconfig,target=/home/vscode/.gitconfig,type=bind,consistency=cached",
+        "source=${localEnv:HOME}/.gnupg,target=/home/vscode/.gnupg,type=bind,consistency=cached",
+        "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached"
     ]
 }

src/devcontainers/base/src/.devcontainer/nhsnotify/install.sh

@@ -3,23 +3,6 @@
 cp ./postcreatecommand.sh /postcreatecommand.sh
 cp ./poststartcommand.sh /poststartcommand.sh
 cp ./welcome.sh /welcome.sh
-cp ./Makefile ~/Makefile
+cp ./Makefile /Makefile
 
-cp ~/.zshrc /.zshrc
-# rm -Rf /.asdf
-# git clone https://github.com/asdf-vm/asdf.git /.asdf;
-# chmod +x /.asdf/asdf.sh;
-# echo '. /.asdf/asdf.sh' >> /.zshrc
-# echo '. /.asdf/completions/asdf.bash' >> /.zshrc
-sed -i "/plugins=/c\plugins=(git ssh-agent sudo terraform dirhistory zsh-autosuggestions)" /.zshrc
 
-cat /.zshrc
-
-cp /.zshrc ~/.zshrc
-source ~/.zshrc
-mkdir -p /zsh/plugins/zsh-autosuggestions
-git clone https://github.com/zsh-users/zsh-autosuggestions /zsh/plugins/zsh-autosuggestions
-
-
-mkdir -p /nhsengland/repository-template
-git clone https://github.com/nhs-england-tools/repository-template /nhsengland/repository-template

src/devcontainers/base/src/.devcontainer/nhsnotify/postcreatecommand.sh

@@ -1,24 +1,57 @@
 #!/bin/bash
+CURRENT_DIR=$(pwd)
+
+echo 'install asdf via go'
+go install github.com/asdf-vm/asdf/cmd/[email protected]
+echo 'export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"' >> ~/.zshrc
+#git clone https://github.com/zsh-users/zsh-autosuggestions ~/.zsh/zsh-autosuggestions
+#echo 'source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh' >> ~/.zshrc
+#sed -i "/plugins=/c\plugins=(git ssh-agent sudo terraform dirhistory zsh-autosuggestions)" ~/.zshrc
+sed -i "/plugins=/c\plugins=(git ssh-agent sudo terraform dirhistory)" ~/.zshrc
+cat ~/.zshrc
+
 
-cp /.zshrc ~/.zshrc
-cp -r /zsh/* ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}
-ls -la ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}
+echo "installing asdf plugins"
+curl -sSfL https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | sh
+echo 'eval "$(zoxide init zsh)"' >> ~/.zshrc
+echo "zoxide plugin added"
 
 cat ~/.zshrc
-source ~/.zshrc
-echo 'asdf setup complete'
 
+echo "copying defaults"
+echo "getting nhse repo template"
+echo "Cloning $REPO into $DEST"
+
+REPO=https://github.com/NHSDigital/nhs-notify-repository-template.git
+DEST=$HOME/nhsengland/repository-template
 
-echo 'copying defaults'
+mkdir -p $DEST
+echo "created destination directory $DEST"
+echo "Cloning repository from $REPO to $DEST"
+git clone $REPO $DEST
+echo "cloned repository $REPO to $DEST"
+git switch -C updating-the-default-files
 
-cp /nhsengland/repository-template/scripts ./scripts -r
-cp /nhsengland/repository-template/Makefile ./
-cp /nhsengland/repository-template/.tool-versions ./
+\cp -rf $DEST/scripts ./scripts
+\cp -f $DEST/Makefile ./
+\cp -f $DEST/.tool-versions ./
 
+git add .
+git commit -m "Update default files from $REPO" || echo "No changes to commit"
+
+git switch -
+git merge updating-the-default-files -m "Merge default files from $REPO"
+echo "$REPO template complete"
+
+echo "running make config"
+source ~/.zshrc
+echo "sourced .zshrc"
 make config
-echo 'make config complete'
+echo "make config complete"
 
-# jekyll --version && cd docs && bundle install
-# echo 'jekyll setup complete'
+cd $CURRENT_DIR
 
-#/welcome.sh
+echo "sorting certs"
+sudo cp -nr /home/ca-certificates/. /usr/local/share/ca-certificates
+sudo update-ca-certificates
+echo "sorted certs"

src/devcontainers/base/src/.devcontainer/nhsnotify/poststartcommand.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+omz reload
 /welcome.sh

src/devcontainers/base/src/.devcontainer/scripts/init.sh

@@ -0,0 +1,3 @@
+mkdir -p $HOME/.aws || true
+mkdir -p $HOME/.gnupg || true
+mkdir -p $HOME/.ssh || true