diff --git a/.drone.star b/.drone.star index 23b4707..0f916d3 100644 --- a/.drone.star +++ b/.drone.star @@ -13,7 +13,7 @@ TEMPLATES = { "distro_package_manager": "apk", "distro_releases": ["edge"], "image": "cr.smcm.xyz/coder-images/alpine", - "startup_script_include": "alpine/aports.tf.jinja", + "startup_scripts": ["startup_scripts/alpine_aports.tf.jinja"], }, "ubuntu": { "distro_name": "Ubuntu Linux", diff --git a/_distro.tf.jinja b/_distro.tf.jinja index c0bda32..448e9f2 100644 --- a/_distro.tf.jinja +++ b/_distro.tf.jinja @@ -16,12 +16,8 @@ data "coder_parameter" "distro_release" { } {% for version in distro_releases %} option { - name = "{{ version["name"] }}" - {% if "suffix" in version %} - value = "-{{ version["suffix"] }}" - {% else %} - value = "" - {% endif %} + name = "{{ version }}" + value = "-{{ version }}" } {% endfor %} } @@ -32,8 +28,10 @@ data "coder_parameter" "distro_release" { {% endblock %} {% block post_startup_script_setup_home %} - {% if startup_script_include %} - {% include startup_script_include %} + {% if startup_scripts %} + {% for startup_script in startup_scripts %} + {% include startup_script %} + {% endfor %} {% endif %} {% endblock %} diff --git a/alpine/aports.tf.jinja b/startup_scripts/alpine_aports.tf.jinja similarity index 100% rename from alpine/aports.tf.jinja rename to startup_scripts/alpine_aports.tf.jinja diff --git a/startup_scripts/gcloud.tf.jinja b/startup_scripts/gcloud.tf.jinja new file mode 100644 index 0000000..e69de29