optimize

Reviewed-on: #2

.gitea/workflows/build-base.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'Dockerfile.base'
+      - 'Dockerfile'
   schedule:
     - cron: "@monthly"
   workflow_dispatch:
@@ -16,22 +16,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        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@v3
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
         with:
           registry: ${{ vars.REGISTRY_URL }}
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Build and push base image
-        uses: docker/build-push-action@v5
+        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

.gitea/workflows/build-cli.yml

@@ -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@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
-
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push CLI image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./tools/coder-cli/Dockerfile
-          push: true
-          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:cli

.gitea/workflows/build-terraform-shell.yml

@@ -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@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
-
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.REGISTRY_URL }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
-      - name: Build and push shell image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./tools/terraform-shell/Dockerfile
-          push: true
-          tags: ${{ vars.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/coder-base:terraform

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
-    }
   ]
 }

tools/coder-cli/Dockerfile

@@ -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 []

tools/terraform-shell/Dockerfile

@@ -1,2 +0,0 @@
-FROM docker.io/hashicorp/terraform:1.14.1@sha256:1de2a42a99e36490585dcb60c43daf9f11381b10f40a0c7ddfd1e03733009aec
-ENTRYPOINT []