From 1d562bd653d9e1b187e049fc709a2deb81799169 Mon Sep 17 00:00:00 2001
From: anthorob <tony@bobert.me>
Date: Fri, 14 Nov 2025 13:30:27 -0500
Subject: [PATCH] repo

---
 .gitlab-ci.yml                       | 17 +----------------
 Dockerfile.base                      | 19 -------------------
 java/.gitlab-ci.yml                  |  1 -
 java/Dockerfile.java21               |  2 +-
 php/.gitlab-ci.yml                   |  1 -
 php/Dockerfile.php82                 |  2 +-
 tools/coder-cli/.gitlab-ci.yml       | 11 -----------
 tools/coder-cli/Dockerfile           |  6 ------
 tools/terraform-shell/.gitlab-ci.yml | 11 -----------
 tools/terraform-shell/Dockerfile     |  2 --
 10 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 Dockerfile.base
 delete mode 100644 tools/coder-cli/.gitlab-ci.yml
 delete mode 100644 tools/coder-cli/Dockerfile
 delete mode 100644 tools/terraform-shell/.gitlab-ci.yml
 delete mode 100644 tools/terraform-shell/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81d0b15..a4d65ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: quay.io/buildah/stable@sha256:7950cabdb65648ef74496c80f2ade316e76f5a19a719dc5b1755470ed50d084f
+image: quay.io/buildah/stable:latest
 
 variables:
   STORAGE_DRIVER: vfs
@@ -7,23 +7,8 @@ variables:
   BUILDAH_NO_PROMPT: "1"
 
 stages:
-  - base
   - build
 
-build_base:
-  stage: base
-  script:
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:base -f Dockerfile.base .
-    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - buildah push ${FQ_IMAGE_NAME}:base
-  rules:
-    - changes:
-        - Dockerfile.base
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-    - when: never
-
 include:
-  - "tools/coder-cli/.gitlab-ci.yml"
-  - "tools/terraform-shell/.gitlab-ci.yml"
   - "java/.gitlab-ci.yml"
   - "php/.gitlab-ci.yml"
\ No newline at end of file
diff --git a/Dockerfile.base b/Dockerfile.base
deleted file mode 100644
index 008e221..0000000
--- a/Dockerfile.base
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM docker.io/codercom/enterprise-base:ubuntu@sha256:05cdf15023f7c17713f1a6aec984e693484d46858bad11324963634aa91c2cdb
-
-USER root
-
-# Shared base utilities only
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        curl \
-        unzip \
-        git \
-        nano \
-        ca-certificates \
-        software-properties-common \
-        lsb-release \
-        gnupg \
-        && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-USER coder
-WORKDIR /home/coder
\ No newline at end of file
diff --git a/java/.gitlab-ci.yml b/java/.gitlab-ci.yml
index 22c61f5..09666ae 100644
--- a/java/.gitlab-ci.yml
+++ b/java/.gitlab-ci.yml
@@ -8,7 +8,6 @@
   rules:
     - changes:
         - java/**
-        - Dockerfile.base
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 build_java21:
diff --git a/java/Dockerfile.java21 b/java/Dockerfile.java21
index 350bf54..10bd3d0 100644
--- a/java/Dockerfile.java21
+++ b/java/Dockerfile.java21
@@ -1,4 +1,4 @@
-FROM registry.bobert.me/anthorob/coder-images:base@sha256:bf0b3aa1de0b4448e2f3fc36c7e68fab349aaab40b04416d8e6e1bf26faa6987
+FROM registry.bobert.me/anthorob/coder-base:latest
 
 USER root
 
diff --git a/php/.gitlab-ci.yml b/php/.gitlab-ci.yml
index 2fdfe0c..0062735 100644
--- a/php/.gitlab-ci.yml
+++ b/php/.gitlab-ci.yml
@@ -8,7 +8,6 @@
   rules:
     - changes:
         - php/**
-        - Dockerfile.base
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
 
 build_php82:
diff --git a/php/Dockerfile.php82 b/php/Dockerfile.php82
index f3e3608..9a35a34 100644
--- a/php/Dockerfile.php82
+++ b/php/Dockerfile.php82
@@ -1,4 +1,4 @@
-FROM registry.bobert.me/anthorob/coder-images:base@sha256:bf0b3aa1de0b4448e2f3fc36c7e68fab349aaab40b04416d8e6e1bf26faa6987
+FROM registry.bobert.me/anthorob/coder-base:latest
 
 USER root
 
diff --git a/tools/coder-cli/.gitlab-ci.yml b/tools/coder-cli/.gitlab-ci.yml
deleted file mode 100644
index 6fb6c33..0000000
--- a/tools/coder-cli/.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-build_cli:
-  stage: base
-  script:
-    - buildah info
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:coder-cli -f tools/coder-cli/Dockerfile .
-    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - buildah push ${FQ_IMAGE_NAME}:coder-cli
-  rules:
-    - changes:
-        - tools/coder-cli/**
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
\ No newline at end of file
diff --git a/tools/coder-cli/Dockerfile b/tools/coder-cli/Dockerfile
deleted file mode 100644
index 1266c44..0000000
--- a/tools/coder-cli/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM alpine:latest@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
-
-RUN apk add --no-cache curl sed
-RUN curl -fsSL https://coder.com/install.sh | sh
-
-ENTRYPOINT []
\ No newline at end of file
diff --git a/tools/terraform-shell/.gitlab-ci.yml b/tools/terraform-shell/.gitlab-ci.yml
deleted file mode 100644
index 6be12ee..0000000
--- a/tools/terraform-shell/.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-build_shell:
-  stage: base
-  script:
-    - buildah info
-    - buildah bud --storage-driver=${STORAGE_DRIVER} -t ${FQ_IMAGE_NAME}:terraform-shell -f tools/terraform-shell/Dockerfile .
-    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - buildah push ${FQ_IMAGE_NAME}:terraform-shell
-  rules:
-    - changes:
-        - tools/terraform-shell/**
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
\ No newline at end of file
diff --git a/tools/terraform-shell/Dockerfile b/tools/terraform-shell/Dockerfile
deleted file mode 100644
index eae373e..0000000
--- a/tools/terraform-shell/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM docker.io/hashicorp/terraform:1.13.5@sha256:6bbb82d575aa7bd4f0a2c6e3a0838ab9590426c08a71d7a2783643f01004d356
-ENTRYPOINT []
\ No newline at end of file