diff --git a/.devcontainer/features/bash-config/config/bash-config-rc b/.devcontainer/features/bash-config/config/bash-config-rc index 2d3883e..4241da8 100644 --- a/.devcontainer/features/bash-config/config/bash-config-rc +++ b/.devcontainer/features/bash-config/config/bash-config-rc @@ -1,6 +1,8 @@ #!/bin/bash # default opinioned bash configuration +# DO NOT MODIFY if installed in /bash-config +# this file will be overwritten on each container launch # enable enternal shared history export HISTCONTROL=ignoreboth:erasedups diff --git a/.devcontainer/features/bash-config/config/postCreateCommand.sh b/.devcontainer/features/bash-config/config/postCreateCommand.sh new file mode 100644 index 0000000..ca3ec70 --- /dev/null +++ b/.devcontainer/features/bash-config/config/postCreateCommand.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# this script is run once inside the developer container after creation time + +# Install man so we can do git --help +apt-get update && apt-get install -y --no-install-recommends man diff --git a/.devcontainer/features/bash-config/devcontainer-feature.json b/.devcontainer/features/bash-config/devcontainer-feature.json index dcd52bb..a7cf5e3 100644 --- a/.devcontainer/features/bash-config/devcontainer-feature.json +++ b/.devcontainer/features/bash-config/devcontainer-feature.json @@ -8,7 +8,7 @@ "documentationURL": "https://raw.githubusercontent.com/DiamondLightSource/devcontainer-features/refs/heads/main/.devcontainer/features/bash-config/README.md", "containerEnv": { "CONFIG_FOLDER": "/bash-config", - "CONFIG_STAGING": "/bash-config-staging" + "CONFIG_STAGING": "/tmp/bash-config" }, "mounts": [ { @@ -17,5 +17,6 @@ "type": "bind" } ], - "onCreateCommand": "bash /bash-config-staging/onCreateCommand.sh" + "onCreateCommand": "bash /tmp/bash-config/onCreateCommand.sh", + "postCreateCommand": "bash /tmp/bash-config/postCreateCommand.sh" } \ No newline at end of file diff --git a/test/bash-config/test.sh b/test/bash-config/test.sh index a230aa1..09676e0 100644 --- a/test/bash-config/test.sh +++ b/test/bash-config/test.sh @@ -11,6 +11,7 @@ source dev-container-features-test-lib # The 'check' command comes from the dev-container-features-test-lib. Syntax is... # check