update
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Steve McMaster 2023-08-24 20:17:48 -04:00
parent bd23ebe45a
commit 52075482cf
5 changed files with 56 additions and 64 deletions

View File

@ -2,6 +2,20 @@ CODER_URL = "https://github.com/coder/coder/releases/download/v2.0.0/coder_2.0.0
TEMPLATES = {
"base": {},
"_lang": {
"golang": {
"lang": "golang",
"versions": "1.21"
},
"python": {
"lang": "python",
"versions": "3.8,3.11"
},
"rust": {
"lang": "rust",
"versions": "1.71"
}
},
"alpine": {
"alpine": {
"image": "cr.smcm.xyz/coder-images/alpine",
@ -15,17 +29,8 @@ TEMPLATES = {
"coder_user_gid": "1002",
}
},
"python": {
"python": {
"image": "cr.smcm.xyz/coder-images/python",
"python_versions": "3.8,3.11"
}
},
"rust": {
"rust": {
"image": "cr.smcm.xyz/coder-images/rust",
"rust_versions": "1.71"
}
"jupyter": {
"jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"},
},
"splunk": {
"splunk": {
@ -33,8 +38,11 @@ TEMPLATES = {
"splunk_versions": "8.2,9.0,9.1"
},
},
"jupyter": {
"jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"},
"ubuntu": {
"ubuntu": {
"image": "cr.smcm.xyz/coder-images/ubuntu",
"alpine_releases": "20.04,22.04,23.04,23.10"
},
},
}

View File

@ -3,9 +3,9 @@
{% block parameters %}
{{ super() }}
data "coder_parameter" "python_version" {
name = "Python Version"
description = "Python Version"
data "coder_parameter" "version" {
name = "{{lang}} Version"
description = "{{lang}} Version"
type = "string"
default = ""
@ -14,7 +14,7 @@ data "coder_parameter" "python_version" {
name = "Latest"
value = ""
}
{% for version in python_versions.split(",") %}
{% for version in versions.split(",") %}
option {
name = "{{ version }}"
value = "-{{ version }}"
@ -29,7 +29,7 @@ data "coder_parameter" "container_base" {
default = ""
mutable = false
option {
name = "Debian Buster"
name = "Debian Linux"
value = ""
}
option {
@ -40,5 +40,5 @@ data "coder_parameter" "container_base" {
{% endblock %}
{% block kubernetes_pod_main_image %}
image = "{{image}}${data.coder_parameter.python_version.value}${data.coder_parameter.container_base.value}:latest"
image = "cr.smcm.xyz/coder-images/{{lang}}${data.coder_parameter.version.value}${data.coder_parameter.container_base.value}:latest"
{% endblock %}

View File

@ -17,7 +17,7 @@ data "coder_parameter" "alpine_release" {
{% for version in alpine_releases.split(",") %}
option {
name = "{{ version }}"
value = "-{{ version | replace(".", "") }}"
value = "-{{ version }}"
}
{% endfor %}
}

View File

@ -1,44 +0,0 @@
{% extends "base.tf.jinja" %}
{% block parameters %}
{{ super() }}
data "coder_parameter" "rust_version" {
name = "Rust Version"
description = "Rust Version"
type = "string"
default = ""
mutable = true
option {
name = "Latest"
value = ""
}
{% for version in rust_versions.split(",") %}
option {
name = "{{ version }}"
value = "-{{ version }}"
}
{% endfor %}
}
data "coder_parameter" "container_base" {
name = "Container Base"
description = "Container Base"
type = "string"
default = ""
mutable = false
option {
name = "Debian Buster"
value = ""
}
option {
name = "Alpine Linux"
value = "-alpine"
}
}
{% endblock %}
{% block kubernetes_pod_main_image %}
image = "{{image}}${data.coder_parameter.rust_version.value}${data.coder_parameter.container_base.value}:latest"
{% endblock %}

28
ubuntu.tf.jinja Normal file
View File

@ -0,0 +1,28 @@
{% extends "base.tf.jinja" %}
{% block parameters %}
{{ super() }}
data "coder_parameter" "ubuntu_release" {
name = "Ubuntu Release"
description = "Ubuntu Release"
type = "string"
default = ""
mutable = true
option {
name = "Latest"
value = ""
}
{% for version in ubuntu_releases.split(",") %}
option {
name = "{{ version }}"
value = "-{{ version }}"
}
{% endfor %}
}
{% endblock %}
{% block kubernetes_pod_main_image %}
image = "{{image}}${data.coder_parameter.ubuntu_release.value}:latest"
{% endblock %}