From bd51ac0af735300236a6031c05d8f8c6b1a2826a Mon Sep 17 00:00:00 2001
From: anthorob <tony@bobert.me>
Date: Wed, 3 Dec 2025 11:58:49 -0500
Subject: [PATCH] update images

---
 {coder-base => base}/README.md    |  0
 {coder-base => base}/main.tf      |  0
 {coder-base => base}/outputs.tf   |  0
 {coder-base => base}/variables.tf |  0
 ci-scripts/generate-pipeline.sh   |  8 ++++----
 templates/java/main.tf            | 12 +-----------
 templates/php/main.tf             | 14 ++------------
 7 files changed, 7 insertions(+), 27 deletions(-)
 rename {coder-base => base}/README.md (100%)
 rename {coder-base => base}/main.tf (100%)
 rename {coder-base => base}/outputs.tf (100%)
 rename {coder-base => base}/variables.tf (100%)

diff --git a/coder-base/README.md b/base/README.md
similarity index 100%
rename from coder-base/README.md
rename to base/README.md
diff --git a/coder-base/main.tf b/base/main.tf
similarity index 100%
rename from coder-base/main.tf
rename to base/main.tf
diff --git a/coder-base/outputs.tf b/base/outputs.tf
similarity index 100%
rename from coder-base/outputs.tf
rename to base/outputs.tf
diff --git a/coder-base/variables.tf b/base/variables.tf
similarity index 100%
rename from coder-base/variables.tf
rename to base/variables.tf
diff --git a/ci-scripts/generate-pipeline.sh b/ci-scripts/generate-pipeline.sh
index 93fed79..a14bc7e 100644
--- a/ci-scripts/generate-pipeline.sh
+++ b/ci-scripts/generate-pipeline.sh
@@ -14,7 +14,7 @@ for dir in templates/*; do
 
 validate_$name:
   stage: validate
-  image: registry.bobert.me/anthorob/coder-images:terraform-shell
+  image: registry.bobert.me/anthorob/coder-base:terraform
   script:
     - terraform -chdir=$dir init -backend=false
     - terraform -chdir=$dir validate
@@ -25,11 +25,11 @@ validate_$name:
   rules:
     - changes:
         - $dir/**
-        - coder-base/**
+        - base/**
 
 deploy_$name:
   stage: deploy
-  image: registry.bobert.me/anthorob/coder-images:coder-cli
+  image: registry.bobert.me/anthorob/coder-base: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 "$display_name Dev Environment" --description "Development environment for $name" --icon "/icon/$name.svg" --yes
@@ -38,7 +38,7 @@ deploy_$name:
   rules:
     - changes:
         - $dir/**
-        - coder-base/**
+        - base/**
 EOF
 
 done
diff --git a/templates/java/main.tf b/templates/java/main.tf
index 548fa9b..eb5b5a5 100644
--- a/templates/java/main.tf
+++ b/templates/java/main.tf
@@ -15,16 +15,6 @@ data "coder_parameter" "java_version" {
   type        = "string"
   default     = "21"
 
-  option {
-    name  = "Java 8"
-    value = "8"
-  }
-
-  option {
-    name  = "Java 17"
-    value = "17"
-  }
-
   option {
     name  = "Java 21"
     value = "21"
@@ -32,7 +22,7 @@ data "coder_parameter" "java_version" {
 }
 
 module "java_workspace" {
-  source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main"
+  source = "git::https://git.bobert.me/anthorob/coder-templates.git//base?ref=main"
 
   docker_image = "registry.bobert.me/anthorob/coder-images:java${data.coder_parameter.java_version.value}"
 
diff --git a/templates/php/main.tf b/templates/php/main.tf
index abef6c0..f54de6f 100644
--- a/templates/php/main.tf
+++ b/templates/php/main.tf
@@ -19,16 +19,6 @@ data "coder_parameter" "php_version" {
     name  = "PHP 8.2"
     value = "82"
   }
-
-  option {
-    name  = "PHP 8.0"
-    value = "80"
-  }
-
-  option {
-    name  = "PHP 7.4"
-    value = "74"
-  }
 }
 
 data "coder_parameter" "node_version" {
@@ -54,7 +44,7 @@ data "coder_parameter" "node_version" {
 }
 
 module "php_workspace" {
-  source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main"
+  source = "git::https://git.bobert.me/anthorob/coder-templates.git//base?ref=main"
 
   docker_image = "registry.bobert.me/anthorob/coder-images:php${data.coder_parameter.php_version.value}"
 
@@ -99,7 +89,7 @@ module "php_workspace" {
     "mikestead.dotenv",
     "christian-kohler.path-intellisense",
     "ms-vscode.vscode-typescript-tslint-plugin",
-    
+    "laravel.vscode-laravel"
   ]
 
   vscode_settings = {