diff --git a/alpine.tf.jinja b/alpine.tf.jinja index fabc8a0..16a6415 100644 --- a/alpine.tf.jinja +++ b/alpine.tf.jinja @@ -15,12 +15,14 @@ git config --global user.email "steve@mcmaster.io" # Generate abuild keys if needed + if [ ! -f "$HOME/.abuild/abuild.conf" ]; then + abuild-keygen -a -i -n + fi + [ -e "$HOME/.abuild/abuild.conf" ] && . $HOME/.abuild/abuild.conf if [ -n "$PACKAGER_PRIVKEY" ]; then sudo cp $PACKAGER_PRIVKEY /etc/apk/keys/ - else - abuild-keygen -a -i -n fi # Update apk diff --git a/base.tf.jinja b/base.tf.jinja index 824f3aa..632543c 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -62,8 +62,8 @@ resource "coder_agent" "main" { {% block startup_script_install_code_server %} # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh | tee code-server-install.log - code-server --auth none --port 13337 | tee code-server-install.log & + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=$HOME/code-server --version 4.11.0 + $HOME/code-server/bin/code-server --auth none --port 13337 > $HOME/code-server.log 2>&1 & {% endblock %} {% block post_startup_script_install_code_server %}