From aabc3c0d933572206a6cc8ec57aff2ba8109074c Mon Sep 17 00:00:00 2001
From: anthorob <tony@bobert.me>
Date: Wed, 18 Mar 2026 09:41:10 -0400
Subject: [PATCH] optimize

---
 .gitea/workflows/build-base.yml            |  4 +--
 .gitea/workflows/build-cli.yml             | 40 ----------------------
 .gitea/workflows/build-terraform-shell.yml | 40 ----------------------
 Dockerfile.base => Dockerfile              |  0
 renovate.json                              |  8 -----
 tools/coder-cli/Dockerfile                 |  6 ----
 tools/terraform-shell/Dockerfile           |  2 --
 7 files changed, 2 insertions(+), 98 deletions(-)
 delete mode 100644 .gitea/workflows/build-cli.yml
 delete mode 100644 .gitea/workflows/build-terraform-shell.yml
 rename Dockerfile.base => Dockerfile (100%)
 delete mode 100644 tools/coder-cli/Dockerfile
 delete mode 100644 tools/terraform-shell/Dockerfile

diff --git a/.gitea/workflows/build-base.yml b/.gitea/workflows/build-base.yml
index 659d3ad..83f327d 100644
--- a/.gitea/workflows/build-base.yml
+++ b/.gitea/workflows/build-base.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'Dockerfile.base'
+      - 'Dockerfile'
   schedule:
     - cron: "@monthly"
   workflow_dispatch:
@@ -32,6 +32,6 @@ jobs:
         uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
         with:
           context: .
-          file: ./Dockerfile.base
+          file: ./Dockerfile
           push: true
           tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:latest
\ No newline at end of file
diff --git a/.gitea/workflows/build-cli.yml b/.gitea/workflows/build-cli.yml
deleted file mode 100644
index 5623591..0000000
--- a/.gitea/workflows/build-cli.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build CLI Image
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'tools/coder-cli/**'
-  schedule:
-    - cron: "@monthly"
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build CLI Image
-    runs-on: ubuntu-latest
-    concurrency:
-      group: cli
-      cancel-in-progress: false
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
-
-      - name: Login to registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
-        with:
-          registry: ${{ vars.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push CLI image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./tools/coder-cli/Dockerfile
-          push: true
-          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:cli
\ No newline at end of file
diff --git a/.gitea/workflows/build-terraform-shell.yml b/.gitea/workflows/build-terraform-shell.yml
deleted file mode 100644
index 3ab5d2c..0000000
--- a/.gitea/workflows/build-terraform-shell.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build Terraform Shell Image
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "tools/terraform-shell/**"
-  schedule:
-    - cron: "@monthly"
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build Terraform Shell Image
-    runs-on: ubuntu-latest
-    concurrency:
-      group: terraform
-      cancel-in-progress: false
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
-
-      - name: Login to registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
-        with:
-          registry: ${{ vars.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push shell image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./tools/terraform-shell/Dockerfile
-          push: true
-          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:terraform
\ No newline at end of file
diff --git a/Dockerfile.base b/Dockerfile
similarity index 100%
rename from Dockerfile.base
rename to Dockerfile
diff --git a/renovate.json b/renovate.json
index a44a18b..744a797 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,13 +2,5 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>renovate/renovate-config"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "quay.io/buildah/stable"
-      ],
-      "enabled": false
-    }
   ]
 }
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/Dockerfile b/tools/terraform-shell/Dockerfile
deleted file mode 100644
index 5033e4a..0000000
--- a/tools/terraform-shell/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM docker.io/hashicorp/terraform:1.14.1@sha256:1de2a42a99e36490585dcb60c43daf9f11381b10f40a0c7ddfd1e03733009aec
-ENTRYPOINT []
\ No newline at end of file