From c31eaa6187117bad755575136fd3ab4115c30de8 Mon Sep 17 00:00:00 2001 From: rock Date: Mon, 7 Sep 2026 09:29:20 -0700 Subject: [PATCH] ci: enable custom runner images with node.js and docker pre-installed --- 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 e75a0aa..1d30cfd 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: code.forgejo.org/forgejo/runner - tag: "6" + repository: forgejo.riotpiao.com/rock/forgejo-runner-node + tag: "latest" name: node-runner - labels: "node:docker://node:22-bookworm" + labels: "node:docker://forgejo.riotpiao.com/rock/forgejo-runner-node:latest" # 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 b645cf3..62175ff 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: code.forgejo.org/forgejo/runner - tag: "6" + repository: forgejo.riotpiao.com/rock/forgejo-runner-rust + tag: "latest" name: rust-runner - labels: "rust:docker://rust:1-bookworm" + labels: "rust:docker://forgejo.riotpiao.com/rock/forgejo-runner-rust:latest" diff --git a/k8s/infra/forgejo-runner/values.yaml b/k8s/infra/forgejo-runner/values.yaml index c8e7052..eb135e3 100644 --- a/k8s/infra/forgejo-runner/values.yaml +++ b/k8s/infra/forgejo-runner/values.yaml @@ -1,12 +1,12 @@ runner: image: - repository: code.forgejo.org/forgejo/runner - tag: "6" + repository: forgejo.riotpiao.com/rock/forgejo-runner-golang + tag: "latest" name: golang-runner - # 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" + # Label image is what workflow steps run in. + # Custom image: golang:1.26 + Node.js + Docker pre-installed. + # Image Updater will track and update the :latest tag automatically. + labels: "golang:docker://forgejo.riotpiao.com/rock/forgejo-runner-golang:latest" forgejoUrl: http://forgejo-gitea-http.cicd.svc.cluster.local:3000 tokenSecret: runner-token resources: