Refactor Dockerfiles for Gitea runners: streamline package installations, remove unnecessary dependencies, and ensure non-root execution

ansible/files/dockerfiles/linux-runners/Dockerfile.cicd-base

@@ -1,18 +1,31 @@
 FROM local/gitea-runner-base:latest
 
-# cicd-base runner profile: common CI build and release tooling.
+# Base image sets USER runner; switch back to root for package installs
 USER root
-RUN apk add --no-cache \
-	bash \
-	ca-certificates \
-	curl \
-	git \
-	jq \
-	make \
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	buildah \
+	fuse-overlayfs \
+	iptables \
+	podman \
+	skopeo \
+	slirp4netns \
+	uidmap \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /etc/containers /var/lib/containers /run/containers && \
+	printf '%s\n' '[storage]' 'driver = "vfs"' > /etc/containers/storage.conf && \
+	printf '%s\n' '[engine]' > /etc/containers/containers.conf && \
+	chown -R 1000:1000 /var/lib/containers
+
+ENV BUILDAH_ISOLATION=chroot
+ENV STORAGE_DRIVER=vfs
+
+ARG TRIVY_VERSION=0.72.0
+RUN curl -fsSL -o /tmp/trivy.tar.gz \
+	"https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" && \
+	tar -xzf /tmp/trivy.tar.gz -C /tmp && \
+	install -m 0755 /tmp/trivy /usr/local/bin/trivy && \
+	rm -f /tmp/trivy.tar.gz /tmp/trivy
+
+# Default to non-root execution
+USER runner

ansible/files/dockerfiles/linux-runners/Dockerfile.cpp-build

@@ -1,20 +1,11 @@
 FROM local/gitea-runner-base:latest
 
-# cpp-build runner profile: dedicated C/C++ build environment.
+# Base image sets USER runner; switch back to root for package installs
 USER root
-RUN apk add --no-cache \
-	bash \
-	build-base \
-	ca-certificates \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	build-essential \
 	cmake \
-	curl \
-	git \
-	jq \
-	make \
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip
+	&& rm -rf /var/lib/apt/lists/*
+
+# Default to non-root execution
+USER runner

ansible/files/dockerfiles/linux-runners/Dockerfile.gitea-runner-base

@@ -1,13 +1,38 @@
-FROM docker.io/gitea/runner:latest
+# Stage 1: Extract the gitea-runner binary from the official Alpine-based image
+FROM docker.io/gitea/runner:latest AS runner
 
-USER root
+# Stage 2: Debian-based image with native glibc support
+FROM debian:bookworm-slim
 
-RUN apk add --no-cache \
+COPY --from=runner /usr/local/bin/gitea-runner /usr/local/bin/gitea-runner
+COPY --from=runner /usr/local/bin/run.sh /usr/local/bin/run.sh
+RUN chmod +x /usr/local/bin/run.sh
+
+ENTRYPOINT ["/usr/local/bin/run.sh"]
+
+# Create dedicated runner user (UID 1000) for non-root container execution
+RUN groupadd -g 1000 runner && \
+    useradd -u 1000 -g 1000 -m -d /home/runner -s /bin/bash runner
+
+# Install runner tooling
+RUN apt-get update && apt-get install -y --no-install-recommends \
     bash \
     ca-certificates \
     curl \
     git \
     jq \
+    make \
+    nodejs \
     openssh-client \
+    python3 \
+    python3-pip \
+    rsync \
     unzip \
-    zip
+    zip \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set work directory
+ENV RUNNER_WORKDIR=/home/runner
+
+# Ensure container runs as non-root by default
+USER runner

ansible/files/dockerfiles/linux-runners/Dockerfile.go-build

@@ -1,19 +1,10 @@
 FROM local/gitea-runner-base:latest
 
-# go-build runner profile: dedicated Go build environment.
+# Base image sets USER runner; switch back to root for package installs
 USER root
-RUN apk add --no-cache \
-	bash \
-	ca-certificates \
-	curl \
-	git \
-	go \
-	jq \
-	make \
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	golang-go \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Default to non-root execution
+USER runner

ansible/files/dockerfiles/linux-runners/Dockerfile.image-build

@@ -1,32 +0,0 @@
-FROM local/gitea-runner-base:latest
-
-# image-build runner profile: dedicated environment for container image builds.
-USER root
-RUN apk add --no-cache \
-	bash \
-	buildah \
-	ca-certificates \
-	curl \
-	fuse-overlayfs \
-	git \
-	iptables \
-	jq \
-	make \
-	openssh-client \
-	podman \
-	python3 \
-	py3-pip \
-	rsync \
-	shadow-uidmap \
-	skopeo \
-	slirp4netns \
-	unzip \
-	yq \
-	zip
-
-RUN mkdir -p /etc/containers /var/lib/containers /run/containers && \
-	printf '%s\n' '[storage]' 'driver = "vfs"' > /etc/containers/storage.conf && \
-	printf '%s\n' '[engine]' > /etc/containers/containers.conf
-
-ENV BUILDAH_ISOLATION=chroot
-ENV STORAGE_DRIVER=vfs

ansible/files/dockerfiles/linux-runners/Dockerfile.infra-tools

@@ -1,28 +0,0 @@
-FROM local/gitea-runner-base:latest
-
-# infra-tools runner profile: Ansible and infrastructure automation tools.
-USER root
-RUN apk add --no-cache \
-		bash \
-		ca-certificates \
-		curl \
-		git \
-		jq \
-		make \
-		openssh-client \
-		python3 \
-		py3-pip \
-		rsync \
-		unzip \
-		yq \
-		zip && \
-		python3 -m venv /opt/infra-venv && \
-		/opt/infra-venv/bin/pip install --no-cache-dir \
-			ansible \
-			ansible-lint \
-			bcrypt \
-			fabric \
-			passlib \
-			pywinrm
-
-ENV PATH="/opt/infra-venv/bin:${PATH}"

ansible/files/dockerfiles/linux-runners/Dockerfile.security-scan

@@ -1,25 +0,0 @@
-FROM local/gitea-runner-base:latest
-
-# security-scan runner profile: image and dependency scanning tooling.
-USER root
-RUN apk add --no-cache \
-	bash \
-	ca-certificates \
-	curl \
-	git \
-	jq \
-	make \
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip
-
-ARG TRIVY_VERSION=0.72.0
-RUN curl -fsSL -o /tmp/trivy.tar.gz \
-	"https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz" && \
-	tar -xzf /tmp/trivy.tar.gz -C /tmp && \
-	install -m 0755 /tmp/trivy /usr/local/bin/trivy && \
-	rm -f /tmp/trivy.tar.gz /tmp/trivy