diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get new file mode 100644 index 0000000..3a725ea --- /dev/null +++ b/root/etc/cont-init.d/95-apt-get @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv bash + +apt-get update \ No newline at end of file diff --git a/root/etc/cont-init.d/98-golang b/root/etc/cont-init.d/98-golang index ae6c1a3..374b324 100644 --- a/root/etc/cont-init.d/98-golang +++ b/root/etc/cont-init.d/98-golang @@ -2,24 +2,24 @@ echo "ensuring golang is in PATH" if grep -q -E '^(export )?PATH=' /etc/services.d/code-server/run; then - if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then - sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run - fi - if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then - sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run - fi + if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then + sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run + fi + if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then + sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run + fi else - sed -i '/^#!\/usr\/bin/a \\n# Added by codeserver-golang\nexport PATH=/config/go/bin:$PATH:/usr/local/go/bin' /etc/services.d/code-server/run + sed -i '/^#!\/usr\/bin/a \\n# Added by codeserver-golang\nexport PATH=/config/go/bin:$PATH:/usr/local/go/bin' /etc/services.d/code-server/run fi ARCH=$(uname -m) if [ -f "/golang/golang_${ARCH}.tar.gz" ]; then - echo "Installing golang" - tar xzf "/golang/golang_${ARCH}.tar.gz" -C /usr/local - rm -rf /golang + echo "Installing golang" + tar xzf "/golang/golang_${ARCH}.tar.gz" -C /usr/local + rm -rf /golang - echo "Installing gcc, to make CGO work" - apt-get update && apt-get install -y gcc + echo "Installing gcc, to make CGO work" + apt-get install -y gcc else - echo "Golang already installed, skipping" + echo "Golang already installed, skipping" fi