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

This commit is contained in:
Steve McMaster 2023-08-09 21:33:50 -04:00
parent e8f5a5748f
commit 4047cae98b
4 changed files with 60 additions and 31 deletions

View File

@ -1,56 +1,39 @@
CODER_URL = "https://github.com/coder/coder/releases/download/v2.0.0/coder_2.0.0_linux_amd64.tar.gz" CODER_URL = "https://github.com/coder/coder/releases/download/v2.0.0/coder_2.0.0_linux_amd64.tar.gz"
TEMPLATES = { TEMPLATES = {
"base": { "base": {},
# "android": {"image": "codercom/enterprise-android:ubuntu"},
# "kubernetes": {"image": "codercom/enterprise-base:ubuntu"},
# "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-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"},
},
"alpine": { "alpine": {
"alpine": { "alpine": {
"image": "cr.smcm.xyz/coder-images/alpine", "image": "cr.smcm.xyz/coder-images/alpine",
"alpine_releases": "3.17,3.18,edge" "alpine_releases": "3.17,3.18,edge"
}, },
# "alpine-315": {"image": "cr.smcm.xyz/coder-images/alpine-3.15:latest"},
# "alpine-317": {"image": "cr.smcm.xyz/coder-images/alpine-3.17"},
# "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", "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": {
"image": "cr.smcm.xyz/coder-images/android-2022.09.2",
"coder_user_uid": "3434",
"coder_user_gid": "3434",
} }
}, },
"python": { "python": {
"python": { "python": {
"image": "cr.smcm.xyz/coder-images/python", "image": "cr.smcm.xyz/coder-images/python",
"python_versions": "3.8,3.11", "python_versions": "3.8,3.11"
"alpine_version": "3.18" }
},
"rust": {
"rust": {
"image": "cr.smcm.xyz/coder-images/rust",
"rust_versions": "1.71"
} }
}, },
"splunk": { "splunk": {
"splunk": { "splunk": {
"image": "cr.smcm.xyz/coder-images/splunk", "image": "cr.smcm.xyz/coder-images/splunk",
"splunk_versions": "8.2,9.0" "splunk_versions": "8.2,9.0,9.1"
}, },
# "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": {
# "splunk-python": {"image": "cr.smcm.xyz/coder-images/python-38:latest"},
# },
"jupyter": { "jupyter": {
# "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-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"}, "jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"},
}, },
} }

View File

@ -30,11 +30,13 @@ data "coder_parameter" "alpine_release" {
{% block post_startup_script_setup_home %} {% block post_startup_script_setup_home %}
# Clone the aports repository # Clone the aports repository
if [ ! -d aports/.git ]; then if [ ! -d aports/.git ]; then
git clone https://gitlab.alpinelinux.org/mcm/aports.git git clone git@gitlab.alpinelinux.org:alpine/aports.git
git config remote.origin.pushurl git@gitlab.alpinelinux.org:mcm/aports.git
else
( (
cd aports cd aports
git pull https://gitlab.alpinelinux.org/alpine/aports.git git remote set-url origin git@gitlab.alpinelinux.org:alpine/aports.git
git remote set-url origin git@gitlab.alpinelinux.org:mcm/aports.git git config remote.origin.pushurl git@gitlab.alpinelinux.org:mcm/aports.git
) )
fi fi

View File

@ -33,8 +33,8 @@ data "coder_parameter" "container_base" {
value = "" value = ""
} }
option { option {
name = "Alpine {{ alpine_version }}" name = "Alpine Linux"
value = "-alpine{{ alpine_version }}" value = "-alpine"
} }
} }
{% endblock %} {% endblock %}

44
rust.jinja Normal file
View File

@ -0,0 +1,44 @@
{% 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 %}