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

This commit is contained in:
Steve McMaster 2023-08-05 00:45:53 -04:00
parent 8fa9c9ed45
commit 77285e8c29
3 changed files with 44 additions and 14 deletions

View File

@ -4,25 +4,25 @@ TEMPLATES = {
"base": { "base": {
# "android": {"image": "codercom/enterprise-android:ubuntu"}, # "android": {"image": "codercom/enterprise-android:ubuntu"},
# "kubernetes": {"image": "codercom/enterprise-base:ubuntu"}, # "kubernetes": {"image": "codercom/enterprise-base:ubuntu"},
"python-38": {"image": "cr.smcm.xyz/coder-images/python-3.8:latest"}, # "python-38": {"image": "cr.smcm.xyz/coder-images/python-3.8:latest"},
"python-38-alpine3.18": {"image": "cr.smcm.xyz/coder-images/python-3.8-alpine3.18:latest"}, # "python-38-alpine3.18": {"image": "cr.smcm.xyz/coder-images/python-3.8-alpine3.18:latest"},
"python-311": {"image": "cr.smcm.xyz/coder-images/python-3.11:latest"}, # "python-311": {"image": "cr.smcm.xyz/coder-images/python-3.11:latest"},
"python-311-alpine3.18": {"image": "cr.smcm.xyz/coder-images/python-3.11-alpine3.18:latest"}, # "python-311-alpine3.18": {"image": "cr.smcm.xyz/coder-images/python-3.11-alpine3.18:latest"},
}, },
"alpine": { "alpine": {
"alpine": {"image": "cr.smcm.xyz/coder-images/alpine:latest"}, "alpine": {"image": "cr.smcm.xyz/coder-images/alpine"},
# "alpine-315": {"image": "cr.smcm.xyz/coder-images/alpine-3.15:latest"}, # "alpine-315": {"image": "cr.smcm.xyz/coder-images/alpine-3.15:latest"},
"alpine-317": {"image": "cr.smcm.xyz/coder-images/alpine-3.17:latest"}, "alpine-317": {"image": "cr.smcm.xyz/coder-images/alpine-3.17"},
"alpine-edge": {"image": "cr.smcm.xyz/coder-images/alpine-edge:latest"}, "alpine-edge": {"image": "cr.smcm.xyz/coder-images/alpine-edge"},
}, },
"android": { "android": {
"android-2023-06": { "android-2023-06": {
"image": "cr.smcm.xyz/coder-images/android-2023.06:latest", "image": "cr.smcm.xyz/coder-images/android-2023.06",
"coder_user_uid": "1001", "coder_user_uid": "1001",
"coder_user_gid": "1002", "coder_user_gid": "1002",
}, },
"android-2022-09": { "android-2022-09": {
"image": "cr.smcm.xyz/coder-images/android-2022.09.2:latest", "image": "cr.smcm.xyz/coder-images/android-2022.09.2",
"coder_user_uid": "3434", "coder_user_uid": "3434",
"coder_user_gid": "3434", "coder_user_gid": "3434",
} }
@ -35,9 +35,12 @@ TEMPLATES = {
} }
}, },
"splunk": { "splunk": {
"splunk": {"image": "cr.smcm.xyz/coder-images/splunk:latest"}, "splunk": {
"splunk-82": {"image": "cr.smcm.xyz/coder-images/splunk-8.2:latest"}, "image": "cr.smcm.xyz/coder-images/splunk",
"splunk-90": {"image": "cr.smcm.xyz/coder-images/splunk-9.0:latest"}, "splunk_versions": "8.2,9.0"
},
# "splunk-82": {"image": "cr.smcm.xyz/coder-images/splunk-8.2:latest"},
# "splunk-90": {"image": "cr.smcm.xyz/coder-images/splunk-9.0:latest"},
}, },
# "proxychains": { # "proxychains": {
# "splunk-python": {"image": "cr.smcm.xyz/coder-images/python-38:latest"}, # "splunk-python": {"image": "cr.smcm.xyz/coder-images/python-38:latest"},
@ -45,7 +48,7 @@ TEMPLATES = {
"jupyter": { "jupyter": {
# "jupyter-base-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-base-notebook:latest"}, # "jupyter-base-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-base-notebook:latest"},
# "jupyter-minimal-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-minimal-notebook:latest"}, # "jupyter-minimal-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-minimal-notebook:latest"},
"jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook:latest"}, "jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"},
}, },
} }

View File

@ -280,7 +280,7 @@ resource "kubernetes_deployment" "main" {
container { container {
name = "dev" name = "dev"
{% block kubernetes_pod_main_image %} {% block kubernetes_pod_main_image %}
image = "{{image}}" image = "{{image}}:latest"
{% endblock %} {% endblock %}
{% block kubernetes_pod_main_command %} {% block kubernetes_pod_main_command %}
command = ["bash", "-c", coder_agent.main.init_script] command = ["bash", "-c", coder_agent.main.init_script]

View File

@ -45,4 +45,31 @@ resource "coder_app" "splunk" {
name = "home" name = "home"
read_only = false read_only = false
} }
{% endblock %}
{% block parameters %}
{{ super() }}
data "coder_parameter" "splunk_version" {
name = "Splunk Version"
description = "Splunk Version"
type = "string"
default = ""
mutable = true
option {
name = "Latest"
value = ""
}
{% for version in splunk_version.split(",") %}
option {
name = "{{ version }}"
value = "-{{ version | replace(".", "") }}"
}
{% endfor %}
}
{% endblock %}
{% block kubernetes_pod_main_image %}
image = "{{image}}${data.coder_parameter.splunk_version.value}:latest"
{% endblock %} {% endblock %}