From cdd0ba2c99a4d10a0d77a4889d0b5c0d2a7d9d27 Mon Sep 17 00:00:00 2001
From: rock <locartrock@gmail.com>
Date: Sat, 5 Sep 2026 23:11:55 -0700
Subject: [PATCH] feat: pre-install docker in node-runner image

- Dockerfile.node extends node:22-bookworm with docker.io
- No need for install step in every workflow
- Values-node.yaml references custom image
- Build and push manually (no CI needed)
---
 k8s/infra/forgejo-runner/Dockerfile.node  | 13 +++++++++++++
 k8s/infra/forgejo-runner/values-node.yaml |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 k8s/infra/forgejo-runner/Dockerfile.node

diff --git a/k8s/infra/forgejo-runner/Dockerfile.node b/k8s/infra/forgejo-runner/Dockerfile.node
new file mode 100644
index 0000000..4675233
--- /dev/null
+++ b/k8s/infra/forgejo-runner/Dockerfile.node
@@ -0,0 +1,13 @@
+FROM node:22-bookworm
+
+# Install Docker client (dind sidecar provides the daemon)
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      docker.io \
+      git \
+      curl \
+      ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+# Verify installations
+RUN docker --version && node --version && git --version
diff --git a/k8s/infra/forgejo-runner/values-node.yaml b/k8s/infra/forgejo-runner/values-node.yaml
index c7861e8..9c130e3 100644
--- a/k8s/infra/forgejo-runner/values-node.yaml
+++ b/k8s/infra/forgejo-runner/values-node.yaml
@@ -6,7 +6,8 @@
 # (homelab has no CI; custom runner images built manually if desired)
 runner:
   name: node-runner
-  labels: "node:docker://node:22-bookworm"
+  # Custom image: node:22-bookworm + docker.io pre-installed
+  labels: "node:docker://forgejo.riotpiao.com/rock/forgejo-runner-node:latest"
 
 # GC CronJob renders only from the default (golang) values to avoid duplicates
 gc: