From 038cf40fe5d9f4f0e3f926c7a501c7782c5aa305 Mon Sep 17 00:00:00 2001 From: rock Date: Mon, 7 Sep 2026 09:17:04 -0700 Subject: [PATCH] ci: temporarily revert runners to public images to bootstrap custom image build --- k8s/infra/forgejo-runner/values-node.yaml | 6 +++--- k8s/infra/forgejo-runner/values-rust.yaml | 6 +++--- k8s/infra/forgejo-runner/values.yaml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/k8s/infra/forgejo-runner/values-node.yaml b/k8s/infra/forgejo-runner/values-node.yaml index 1d30cfd..e75a0aa 100644 --- a/k8s/infra/forgejo-runner/values-node.yaml +++ b/k8s/infra/forgejo-runner/values-node.yaml @@ -6,10 +6,10 @@ # Install docker in workflow steps as needed. runner: image: - repository: forgejo.riotpiao.com/rock/forgejo-runner-node - tag: "latest" + repository: code.forgejo.org/forgejo/runner + tag: "6" name: node-runner - labels: "node:docker://forgejo.riotpiao.com/rock/forgejo-runner-node:latest" + labels: "node:docker://node:22-bookworm" # GC CronJob renders only from the default (golang) values to avoid duplicates gc: diff --git a/k8s/infra/forgejo-runner/values-rust.yaml b/k8s/infra/forgejo-runner/values-rust.yaml index 62175ff..b645cf3 100644 --- a/k8s/infra/forgejo-runner/values-rust.yaml +++ b/k8s/infra/forgejo-runner/values-rust.yaml @@ -6,10 +6,10 @@ # Install Node.js/docker in workflow steps as needed. runner: image: - repository: forgejo.riotpiao.com/rock/forgejo-runner-rust - tag: "latest" + repository: code.forgejo.org/forgejo/runner + tag: "6" name: rust-runner - labels: "rust:docker://forgejo.riotpiao.com/rock/forgejo-runner-rust:latest" + labels: "rust:docker://rust:1-bookworm" diff --git a/k8s/infra/forgejo-runner/values.yaml b/k8s/infra/forgejo-runner/values.yaml index f4e7067..c8e7052 100644 --- a/k8s/infra/forgejo-runner/values.yaml +++ b/k8s/infra/forgejo-runner/values.yaml @@ -1,12 +1,12 @@ runner: image: - repository: forgejo.riotpiao.com/rock/forgejo-runner-golang - tag: "latest" + repository: code.forgejo.org/forgejo/runner + tag: "6" name: golang-runner - # Label image is what workflow steps run in. - # Uses custom image with Node.js and Docker pre-installed. - # Image Updater will track and update the :latest tag automatically. - labels: "golang:docker://forgejo.riotpiao.com/rock/forgejo-runner-golang:latest" + # Label image is what workflow steps run in (NOT the runner daemon image). + # golang:1.26-bookworm: Debian, root, apt-get, Go, git. + # TODO: Switch to custom image once build-runner-images.yml pushes images + labels: "golang:docker://golang:1.26-bookworm" forgejoUrl: http://forgejo-gitea-http.cicd.svc.cluster.local:3000 tokenSecret: runner-token resources: