From 67028859dd2531260c18550cc8e48d9de3bba223 Mon Sep 17 00:00:00 2001 From: anthorob Date: Wed, 9 Jul 2025 10:11:30 -0400 Subject: [PATCH] improve --- ci-scripts/generate-pipeline.sh | 9 +++++++++ coder-base/variables.tf | 5 ----- templates/java/main.tf | 3 +-- templates/php/main.tf | 1 - 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ci-scripts/generate-pipeline.sh b/ci-scripts/generate-pipeline.sh index 45da181..81eb5ee 100644 --- a/ci-scripts/generate-pipeline.sh +++ b/ci-scripts/generate-pipeline.sh @@ -21,14 +21,23 @@ validate_$name: paths: - $dir/.terraform.lock.hcl expire_in: 1 hour + rules: + - changes: + - $dir/** + - coder-base/** deploy_$name: stage: deploy image: registry.bobert.me/anthorob/coder-images:coder-cli script: - coder templates push -d $dir --name "${CI_COMMIT_SHORT_SHA}" --message "Auto-deployed from ${CI_PROJECT_PATH} on commit ${CI_COMMIT_SHORT_SHA}" --yes $name + - coder templates edit $name --display-name "$(echo "$name" | sed 's/.*/\u&/' | sed 's/-/ /g')" --description "Development environment for $name" --icon "/icon/$name.svg" --yes dependencies: - validate_$name + rules: + - changes: + - $dir/** + - coder-base/** EOF done diff --git a/coder-base/variables.tf b/coder-base/variables.tf index 21df4b4..cb18df8 100644 --- a/coder-base/variables.tf +++ b/coder-base/variables.tf @@ -1,8 +1,3 @@ -variable "language" { ## construct docker image with this? - description = "Language label for metadata" - type = string -} - variable "docker_image" { description = "Docker image to use for the container" type = string diff --git a/templates/java/main.tf b/templates/java/main.tf index 5601587..548fa9b 100644 --- a/templates/java/main.tf +++ b/templates/java/main.tf @@ -34,8 +34,7 @@ data "coder_parameter" "java_version" { module "java_workspace" { source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main" - language = "Java" - docker_image = "registry.bobert.me/anthorob/coder-images:java${data.coder_parameter.java_version.value}" + docker_image = "registry.bobert.me/anthorob/coder-images:java${data.coder_parameter.java_version.value}" language_metadata = [ { diff --git a/templates/php/main.tf b/templates/php/main.tf index 2e80037..cb4a338 100644 --- a/templates/php/main.tf +++ b/templates/php/main.tf @@ -24,7 +24,6 @@ data "coder_parameter" "php_version" { module "php_workspace" { source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main" - language = "PHP" docker_image = "registry.bobert.me/anthorob/coder-images:php${data.coder_parameter.php_version.value}" language_metadata = [