Skip to content

Commit d592b9e

Browse files
update init path.
1 parent 81932f2 commit d592b9e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"runArgs": [
105105
"--platform=linux/amd64"
106106
],
107-
"initializeCommand": "./scripts/init.sh",
107+
"initializeCommand": "/setup/scripts/init.sh",
108108
"mounts": [
109109
"source=/usr/local/share/ca-certificates,target=/home/ca-certificates,type=bind,consistency=cached",
110110
"source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached",

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ echo "Cloning $REPO into $DEST"
2424

2525
REPO=https://github.com/NHSDigital/nhs-notify-repository-template.git
2626
DEST=$HOME/nhsengland/repository-template
27+
UPDATE_BRANCH=updating-the-default-files
2728

2829
mkdir -p $DEST
2930
echo "created destination directory $DEST"
3031
echo "Cloning repository from $REPO to $DEST"
3132
git clone $REPO $DEST
3233
echo "cloned repository $REPO to $DEST"
33-
git switch -C updating-the-default-files
34+
git switch -C $UPDATE_BRANCH
3435

3536
\cp -rf $DEST/scripts ./scripts
3637
\cp -f $DEST/Makefile ./
@@ -40,7 +41,7 @@ git add .
4041
git commit -m "Update default files from $REPO" || echo "No changes to commit"
4142

4243
git switch -
43-
git merge updating-the-default-files -m "Merge default files from $REPO"
44+
git merge $UPDATE_BRANCH -m "Merge default files from $REPO"
4445
echo "$REPO template complete"
4546

4647
echo "running make config"

0 commit comments

Comments
 (0)