Skip to content

Commit ecc5ac8

Browse files
get default scripts clone.
1 parent 5da934c commit ecc5ac8

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

.github/workflows/cicd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
description: Base development container for NHS Notify projects
3434
vendor: NHS England
3535
subFolder: ./src/devcontainers/base/src
36-
runCmd: /welcome.sh
36+
runCmd: echo "Devcontainer built successfully"
3737

3838
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
3939
permissions:

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
}
5757
},
5858
"features": {
59-
"./nhsnotify": {
60-
"version": "1.0.1"
61-
},
59+
6260
"ghcr.io/devcontainers/features/aws-cli:1": {
6361
"version": "latest"
6462
},
@@ -91,6 +89,15 @@
9189
},
9290
"ghcr.io/devcontainers/features/ruby:1": {
9391
"version": "latest"
92+
},
93+
"ghcr.io/devcontainers/features/go:1": {
94+
"version": "latest"
95+
},
96+
"ghcr.io/devcontainer-community/devcontainer-features/asdf-vm.com:1": {
97+
"version": "latest"
98+
},
99+
"./nhsnotify": {
100+
"version": "1.0.1"
94101
}
95102
},
96103
"forwardPorts": [

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ cp ./welcome.sh /welcome.sh
66
cp ./Makefile ~/Makefile
77

88
cp ~/.zshrc /.zshrc
9-
rm -Rf /.asdf
10-
git clone https://github.com/asdf-vm/asdf.git /.asdf;
11-
chmod +x /.asdf/asdf.sh;
12-
echo '. /.asdf/asdf.sh' >> /.zshrc
13-
echo '. /.asdf/completions/asdf.bash' >> /.zshrc
9+
# rm -Rf /.asdf
10+
# git clone https://github.com/asdf-vm/asdf.git /.asdf;
11+
# chmod +x /.asdf/asdf.sh;
12+
# echo '. /.asdf/asdf.sh' >> /.zshrc
13+
# echo '. /.asdf/completions/asdf.bash' >> /.zshrc
1414
sed -i "/plugins=/c\plugins=(git ssh-agent sudo terraform dirhistory zsh-autosuggestions)" /.zshrc
1515

1616
cat /.zshrc

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ echo 'asdf setup complete'
1010

1111

1212
echo 'copying defaults'
13-
cd ~
13+
1414
cp /nhsengland/repository-template/scripts ./scripts -r
1515
cp /nhsengland/repository-template/Makefile ./
16+
cp /nhsengland/repository-template/.tool-versions ./
1617

1718
make config
1819
echo 'make config complete'

0 commit comments

Comments
 (0)