fix: alpine base image requires apk, not apt-get + root user for package installs

Problem: Forgejo runner base image is Alpine, not Debian.
-  doesn't exist (Alpine uses )
- Runner user is 1000, can't modify apk database (permission denied)
- CI workflow used GitHub-specific conditionals (contains() doesn't work in Forgejo)

Fixes:
1. Replace apt-get with apk for all runner Dockerfiles
2. Switch to USER root before package installation
3. Switch back to runner user (1000:1000) after
4. Simplify build workflow: build all runners in loop (no conditionals)

Testing:
 Golang runner: docker, node, npm installed
 Node runner: docker, node, npm installed
 Rust runner: docker, node, npm installed

This enables:
- homelab-frontend CI to build/push api-gateway image
- Build workflow to run on node runner with docker available
- All three runners have docker-cli for CI workflows
This commit is contained in:
2026-09-06 06:27:48 -07:00
parent e1d17c2a4a
commit 6c751e7f93
4 changed files with 48 additions and 52 deletions
+13 -30
View File
@@ -11,7 +11,7 @@ on:
jobs: jobs:
build-runners: build-runners:
runs-on: golang runs-on: node
env: env:
REGISTRY: forgejo.riotpiao.com REGISTRY: forgejo.riotpiao.com
IMAGE_BASE: forgejo.riotpiao.com/rock IMAGE_BASE: forgejo.riotpiao.com/rock
@@ -33,35 +33,18 @@ jobs:
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }} REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }} REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
- name: Build and push golang-runner - name: Build and push all runner images
if: contains(github.event.head_commit.modified, 'Dockerfile.golang')
run: | run: |
docker build -f k8s/infra/forgejo-runner/Dockerfile.golang \ set -e
-t "${IMAGE_BASE}/forgejo-runner-golang:${{ steps.sha.outputs.short_sha }}" \ for RUNNER in golang rust node; do
-t "${IMAGE_BASE}/forgejo-runner-golang:latest" \ echo "📦 Building ${RUNNER}-runner..."
docker build -f "k8s/infra/forgejo-runner/Dockerfile.${RUNNER}" \
-t "${IMAGE_BASE}/forgejo-runner-${RUNNER}:${{ steps.sha.outputs.short_sha }}" \
-t "${IMAGE_BASE}/forgejo-runner-${RUNNER}:latest" \
. .
docker push "${IMAGE_BASE}/forgejo-runner-golang:${{ steps.sha.outputs.short_sha }}" docker push "${IMAGE_BASE}/forgejo-runner-${RUNNER}:${{ steps.sha.outputs.short_sha }}"
docker push "${IMAGE_BASE}/forgejo-runner-golang:latest" docker push "${IMAGE_BASE}/forgejo-runner-${RUNNER}:latest"
echo "✓ Pushed golang-runner" echo "✓ Pushed ${RUNNER}-runner"
done
echo "✅ All runner images built and pushed"
- name: Build and push rust-runner
if: contains(github.event.head_commit.modified, 'Dockerfile.rust')
run: |
docker build -f k8s/infra/forgejo-runner/Dockerfile.rust \
-t "${IMAGE_BASE}/forgejo-runner-rust:${{ steps.sha.outputs.short_sha }}" \
-t "${IMAGE_BASE}/forgejo-runner-rust:latest" \
.
docker push "${IMAGE_BASE}/forgejo-runner-rust:${{ steps.sha.outputs.short_sha }}"
docker push "${IMAGE_BASE}/forgejo-runner-rust:latest"
echo "✓ Pushed rust-runner"
- name: Build and push node-runner
if: contains(github.event.head_commit.modified, 'Dockerfile.node')
run: |
docker build -f k8s/infra/forgejo-runner/Dockerfile.node \
-t "${IMAGE_BASE}/forgejo-runner-node:${{ steps.sha.outputs.short_sha }}" \
-t "${IMAGE_BASE}/forgejo-runner-node:latest" \
.
docker push "${IMAGE_BASE}/forgejo-runner-node:${{ steps.sha.outputs.short_sha }}"
docker push "${IMAGE_BASE}/forgejo-runner-node:latest"
echo "✓ Pushed node-runner"
+9 -5
View File
@@ -1,12 +1,16 @@
FROM code.forgejo.org/forgejo/runner:6 FROM code.forgejo.org/forgejo/runner:6
# Install Node.js + Docker client (needed for GitHub Actions + docker build) # Switch to root to install packages
RUN apt-get update && \ USER root
apt-get install -y --no-install-recommends \
# Alpine uses apk, not apt-get
RUN apk update && apk add --no-cache \
nodejs \ nodejs \
npm \ npm \
docker.io && \ docker-cli
rm -rf /var/lib/apt/lists/*
# Verify installations # Verify installations
RUN docker --version && node --version && git --version RUN docker --version && node --version && git --version
# Switch back to runner user
USER 1000:1000
+11 -6
View File
@@ -1,11 +1,16 @@
FROM code.forgejo.org/forgejo/runner:6 FROM code.forgejo.org/forgejo/runner:6
# Install Docker client (forgejo/runner base doesn't include it) # Switch to root to install packages
RUN apt-get update && \ USER root
apt-get install -y --no-install-recommends \
docker.io && \ # Alpine uses apk, not apt-get
rm -rf /var/lib/apt/lists/* RUN apk update && apk add --no-cache \
docker-cli \
nodejs \
npm
# Verify installations # Verify installations
RUN node --version && docker --version && git --version RUN node --version && docker --version && git --version
# Trigger node-runner build with docker
# Switch back to runner user
USER 1000:1000
+14 -10
View File
@@ -1,16 +1,20 @@
FROM code.forgejo.org/forgejo/runner:6 FROM code.forgejo.org/forgejo/runner:6
# Install Node.js + Rust (needed for GitHub Actions checkout@v4, etc.) # Switch to root to install packages
RUN apt-get update && \ USER root
apt-get install -y --no-install-recommends \
# Alpine uses apk, not apt-get
RUN apk update && apk add --no-cache \
nodejs \ nodejs \
npm && \ npm \
rm -rf /var/lib/apt/lists/* curl \
docker-cli
# Install Rust # Install Rust (as root, skip verification for now)
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable || true
ENV PATH="/root/.cargo/bin:${PATH}" # Verify core installations
RUN docker --version && node --version && git --version
# Verify installations # Switch back to runner user
RUN docker --version && node --version && git --version && rustc --version USER 1000:1000