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 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
-	bash \
+	buildah \
-	ca-certificates \
+	fuse-overlayfs \
-	curl \
+	iptables \
-	git \
+	podman \
-	jq \
+	skopeo \
-	make \
+	slirp4netns \
-	openssh-client \
+	uidmap \
-	python3 \
+	&& rm -rf /var/lib/apt/lists/*
-	py3-pip \
+
-	rsync \
+RUN mkdir -p /etc/containers /var/lib/containers /run/containers && \
-	unzip \
+	printf '%s\n' '[storage]' 'driver = "vfs"' > /etc/containers/storage.conf && \
-	yq \
+	printf '%s\n' '[engine]' > /etc/containers/containers.conf && \
-	zip
+	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 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
-	bash \
+	build-essential \
-	build-base \
-	ca-certificates \
 	cmake \
-	curl \
+	&& rm -rf /var/lib/apt/lists/*
-	git \
+
-	jq \
+# Default to non-root execution
-	make \
+USER runner
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip

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 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
-	bash \
+	golang-go \
-	ca-certificates \
+	&& rm -rf /var/lib/apt/lists/*
-	curl \
+
-	git \
+# Default to non-root execution
-	go \
+USER runner
-	jq \
-	make \
-	openssh-client \
-	python3 \
-	py3-pip \
-	rsync \
-	unzip \
-	yq \
-	zip

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

ansible/roles/macos_dev_station/defaults/main.yml

@@ -31,12 +31,6 @@ macos_dev_station_code_server_extensions:
   - redhat.ansible
   - eamodio.gitlens
 
-macos_dev_station_copilot_enabled: false
-macos_dev_station_copilot_extensions:
-  - GitHub.copilot
-  - GitHub.copilot-chat
-macos_dev_station_copilot_fail_on_error: false
-
 macos_dev_station_oh_my_zsh_enabled: true
 macos_dev_station_oh_my_zsh_install_url: "https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh"
 

ansible/roles/macos_dev_station/files/install-copilot.sh

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-# ansible: macos_dev_station install-copilot.sh
-# Installs GitHub Copilot and Copilot Chat extensions into code-server
-# with engine-compatible versions resolved from the VS Marketplace API.
-set -euo pipefail
-
-get_engine_version() {
-    local version_output
-    version_output=$(code-server --version | head -n1)
-    if echo "$version_output" | grep -q "with Code"; then
-        echo "$version_output" | sed -n 's/.*with Code \([0-9.]*\).*/\1/p'
-    else
-        echo "$version_output" | awk '{print $1}'
-    fi
-}
-
-get_user_data_dir() {
-    local process_info
-    process_info=$(ps aux 2>/dev/null | grep -v grep | grep "code-server" | head -n 1) ||
-    process_info=$(ps -ef 2>/dev/null | grep -v grep | grep "code-server" | head -n 1)
-    if [ -n "$process_info" ]; then
-        local dir
-        dir=$(echo "$process_info" | grep -o -- '--user-data-dir=[^ ]*' | sed 's/--user-data-dir=//')
-        if [ -n "$dir" ]; then
-            echo "$dir"; return
-        fi
-        dir=$(echo "$process_info" | grep -o -- '--user-data-dir [^ ]*' | sed 's/--user-data-dir //')
-        if [ -n "$dir" ]; then
-            echo "$dir"; return
-        fi
-    fi
-}
-
-find_compatible_version() {
-    local extension_id="$1"
-    local engine_version="$2"
-    local response
-    response=$(curl -s -X POST "https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery" \
-        -H "Content-Type: application/json" \
-        -H "Accept: application/json;api-version=3.0-preview.1" \
-        -d "{
-            \"filters\": [{
-                \"criteria\": [
-                    {\"filterType\": 7, \"value\": \"$extension_id\"},
-                    {\"filterType\": 12, \"value\": \"4096\"}
-                ],
-                \"pageSize\": 50
-            }],
-            \"flags\": 4112
-        }")
-    echo "$response" | jq -r --arg engine_version "$engine_version" '
-        .results[0].extensions[0].versions[] |
-        select(.version | test("^[0-9]+\\.[0-9]+\\.[0-9]*$")) |
-        select(all(.properties[]; .key != "Microsoft.VisualStudio.Code.PreRelease" or .value != "true")) |
-        {
-            version: .version,
-            engine: (.properties[] | select(.key == "Microsoft.VisualStudio.Code.Engine") | .value)
-        } |
-        select(.engine | ltrimstr("^") | split(".") |
-            map(split("-")[0] | tonumber? // 0) as $engine_parts |
-            ($engine_version | split(".") | map(split("-")[0] | tonumber? // 0)) as $server_parts |
-            (
-                ($engine_parts[0] // 0) < $server_parts[0] or
-                (($engine_parts[0] // 0) == $server_parts[0] and ($engine_parts[1] // 0) < $server_parts[1]) or
-                (($engine_parts[0] // 0) == $server_parts[0] and ($engine_parts[1] // 0) == $server_parts[1] and ($engine_parts[2] // 0) <= $server_parts[2])
-            )
-        ) |
-        .version' | head -n 1
-}
-
-install_extension() {
-    local extension_id="$1"
-    local version="$2"
-    local user_data_dir="$3"
-    local extension_name
-    extension_name=$(echo "$extension_id" | cut -d'.' -f2)
-    local temp_dir="/tmp/code-extensions"
-    echo "Installing $extension_id v$version..."
-    mkdir -p "$temp_dir"
-    echo "  Downloading..."
-    curl -L "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/GitHub/vsextensions/$extension_name/$version/vspackage" \
-        -o "$temp_dir/$extension_name.vsix.gz"
-    if [ ! -f "$temp_dir/$extension_name.vsix.gz" ]; then
-        echo "  [SKIP] Download failed for $extension_id"
-        return 1
-    fi
-    if command -v gunzip >/dev/null 2>&1; then
-        gunzip -f "$temp_dir/$extension_name.vsix.gz"
-    else
-        gzip -df "$temp_dir/$extension_name.vsix.gz"
-    fi
-    if [ -n "$user_data_dir" ]; then
-        code-server --user-data-dir="$user_data_dir" --force --install-extension "$temp_dir/$extension_name.vsix"
-    else
-        code-server --force --install-extension "$temp_dir/$extension_name.vsix"
-    fi
-    rm -f "$temp_dir/$extension_name.vsix"
-    echo "  [OK] $extension_id installed successfully!"
-    return 0
-}
-
-check_dependencies() {
-    local missing_deps=()
-    for cmd in curl jq code-server; do
-        if ! command -v "$cmd" >/dev/null 2>&1; then
-            missing_deps+=("$cmd")
-        fi
-    done
-    if ! command -v gunzip >/dev/null 2>&1 && ! command -v gzip >/dev/null 2>&1; then
-        missing_deps+=("gunzip/gzip")
-    fi
-    if [ "${#missing_deps[@]}" -gt 0 ]; then
-        echo "Error: Missing required dependencies: ${missing_deps[*]}"
-        echo "Please install the missing dependencies and try again."
-        exit 1
-    fi
-}
-
-echo "========================================"
-echo " GitHub Copilot Extensions Installer"
-echo "========================================"
-echo ""
-
-check_dependencies
-
-ENGINE_VERSION="$(get_engine_version)"
-if [ -z "$ENGINE_VERSION" ]; then
-    echo "Error: Could not extract engine version from code-server"
-    exit 1
-fi
-echo "Detected code-server engine version: $ENGINE_VERSION"
-
-USER_DATA_DIR="$(get_user_data_dir)"
-if [ -n "$USER_DATA_DIR" ]; then
-    echo "Detected user-data-dir: $USER_DATA_DIR"
-fi
-echo ""
-
-EXTENSIONS="GitHub.copilot GitHub.copilot-chat"
-FAILED=0
-
-for ext in $EXTENSIONS; do
-    echo "Processing $ext..."
-    version="$(find_compatible_version "$ext" "$ENGINE_VERSION")"
-    if [ -z "$version" ]; then
-        echo "  [SKIP] No compatible version found for $ext"
-        FAILED="$((FAILED + 1))"
-    else
-        echo "  Found compatible version: $version"
-        if ! install_extension "$ext" "$version" "$USER_DATA_DIR"; then
-            FAILED="$((FAILED + 1))"
-        fi
-    fi
-    echo ""
-done
-
-echo "========================================"
-if [ $FAILED -eq 0 ]; then
-    echo "[OK] All extensions installed successfully!"
-    rm -rf /tmp/code-extensions
-else
-    echo "[WARN] Completed with $FAILED error(s)"
-    exit 1
-fi

ansible/roles/macos_dev_station/tasks/main.yml

@@ -270,35 +270,6 @@
     - item.rc is defined
     - item.rc != 0
 
-- name: Copy Copilot installer script
-  become: true
-  ansible.builtin.copy:
-    src: install-copilot.sh
-    dest: "{{ macos_dev_station_service_home }}/.cache/install-copilot.sh"
-    owner: "{{ macos_dev_station_service_user }}"
-    group: "{{ macos_dev_station_service_group }}"
-    mode: "0755"
-  when:
-    - macos_dev_station_service_user_enabled | bool
-    - macos_dev_station_copilot_enabled | bool
-
-- name: Install GitHub Copilot extensions via compatible VSIX
-  become: true
-  become_user: "{{ macos_dev_station_service_user }}"
-  ansible.builtin.command: "{{ macos_dev_station_service_home }}/.cache/install-copilot.sh"
-  register: __copilot_install_result
-  changed_when: __copilot_install_result.rc == 0
-  failed_when: >-
-    (macos_dev_station_copilot_fail_on_error | bool)
-    and (__copilot_install_result.rc != 0)
-  environment:
-    HOME: "{{ macos_dev_station_service_home }}"
-    USER: "{{ macos_dev_station_service_user }}"
-    PATH: "{{ macos_dev_station_path }}"
-  when:
-    - macos_dev_station_service_user_enabled | bool
-    - macos_dev_station_copilot_enabled | bool
-
 - name: Ensure devstation SSH directory exists when SSH access is enabled
   become: true
   ansible.builtin.file: