diff --git a/alpine.tf.jinja b/alpine.tf.jinja index f83919c..5a5bcb5 100644 --- a/alpine.tf.jinja +++ b/alpine.tf.jinja @@ -57,9 +57,6 @@ data "coder_parameter" "alpine_release" { ) fi - git config --global user.name "Steve McMaster" - 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 @@ -78,4 +75,12 @@ data "coder_parameter" "alpine_release" { done sudo apk update {% endif %} +{% endblock %} + +{% block startup_script_install_packages %} + sudo apk update + + {% if packages_to_install is defined %} + sudo apk add {{ packages_to_install | join(" ") }} + {% endif %} {% endblock %} \ No newline at end of file diff --git a/base.tf.jinja b/base.tf.jinja index acb49c3..34e4da9 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -147,11 +147,23 @@ resource "coder_agent" "main" { # home folder can be empty, so copying default bash settings [ ! -f ~/.profile ] && [ -f /etc/skel/.profile ] && cp /etc/skel/.profile $HOME [ ! -f ~/.bashrc ] && [ -f /etc/skel/.bashrc ] && cp /etc/skel/.bashrc $HOME + + git config --global user.name data.coder_workspace.me.owner + git config --global user.email data.coder_workspace.me.owner_email {% endblock %} {% block post_startup_script_setup_home %} {% endblock %} + {% block pre_startup_script_install_packages %} + {% endblock %} + + {% block startup_script_install_packages %} + {% endblock %} + + {% block post_startup_script_install_packages %} + {% endblock %} + {% block pre_startup_script_install_code_server %} {% endblock %} diff --git a/ubuntu.tf.jinja b/ubuntu.tf.jinja index ec91042..68ac71b 100644 --- a/ubuntu.tf.jinja +++ b/ubuntu.tf.jinja @@ -25,4 +25,12 @@ data "coder_parameter" "ubuntu_release" { {% block kubernetes_pod_main_image %} image = "{{image}}${data.coder_parameter.ubuntu_release.value}:latest" +{% endblock %} + +{% block startup_script_install_packages %} + sudo apt update + + {% if packages_to_install is defined %} + sudo apt install {{ packages_to_install | join(" ") }} + {% endif %} {% endblock %} \ No newline at end of file