diff --git a/.drone.star b/.drone.star index e4769de..c14c9fd 100644 --- a/.drone.star +++ b/.drone.star @@ -14,10 +14,8 @@ TEMPLATES = { "alpine-edge": {"image": "cr.smcm.xyz/coder-images/alpine-edge:latest"}, }, "android": { - "android-ndk-21-4-7075529": { - "image": "cr.smcm.xyz/coder-images/android:latest", - "ANDROID_NDK_VERSION": "21.4.7075529" - } + "android-2023-06": {"image": "cr.smcm.xyz/coder-images/android-2023.06:latest"}, + "android-2022-09": {"image": "cr.smcm.xyz/coder-images/android-2022.09.2:latest"} }, "splunk": { "splunk": {"image": "cr.smcm.xyz/coder-images/splunk:latest"}, diff --git a/android.tf.jinja b/android.tf.jinja index 07ab1bb..a1559e8 100644 --- a/android.tf.jinja +++ b/android.tf.jinja @@ -4,16 +4,27 @@ {% set coder_user_gid = 3434 %} {% set vs_code_root = "/home/circleci/project" %} +{% block parameters %} +data "coder_parameter" "android_ndk_version" { + name = "NDK Version" + description = "Android NDK version" + type = "string" + default = "21.4.7075529" +} +{% endblock %} + {% block kubernetes_pod_main_env %} env { name = "ANDROID_NDK_VERSION" - value = "{{ANDROID_NDK_VERSION}}" + value = data.coder_parameter.android_ndk_version.value } {{ super() }} {% endblock %} {% block post_startup_script_setup_home %} - sdkmanager "ndk;$ANDROID_NDK_VERSION" + if [ -n "$ANDROID_NDK_VERSION" ]; then + sdkmanager "ndk;$ANDROID_NDK_VERSION" + fi {% endblock %} {% block kubernetes_pod_main_volume_mount %} diff --git a/base.tf.jinja b/base.tf.jinja index ae85c70..824f3aa 100644 --- a/base.tf.jinja +++ b/base.tf.jinja @@ -13,6 +13,9 @@ terraform { } {% endblock %} +{% block parameters %} +{% endblock %} + {% block kubernetes %} provider "kubernetes" { # Authenticate via ~/.kube/config or a Coder-specific ServiceAccount, depending on admin preferences