Add Debian-based image

Author: theihor

Dockerfile

@@ -5,9 +5,7 @@ FROM myoung34/github-runner:ubuntu-${UBUNTU_VERSION}
 ARG UBUNTU_VERSION
 
 COPY install-dependencies.sh /tmp/install-dependencies.sh
-RUN bash /tmp/install-dependencies.sh
-
-RUN apt-get clean
+RUN bash /tmp/install-dependencies.sh all
 
 COPY token.sh /token.sh
 

install-dependencies.sh

@@ -1,27 +1,40 @@
 #!/bin/bash
 
-set -euo pipefail
+set -xeuo pipefail
+
+export DEPS=${1:-"all"} # "build", "run" or "all"
 
 # Most of the BPF CI dependencies are set up by libbpf/ci/setup-build-env action
 # This script runs a subset of that, in order to cache the packages at image build time
-export LIBBPF_CI_TAG=v3
+export LIBBPF_CI_TAG=${LIBBPF_CI_TAG:-"v3"}
+export RUNNER_VERSION=${RUNNER_VERSION:-2.331.0}
 
 # These should correspond to https://github.com/kernel-patches/vmtest/blob/master/.github/scripts/matrix.py#L20-L21
-# Otherwise there is no point in caching dependencies in the image
-export GCC_VERSION=15
-export LLVM_VERSION=21
-
-# do not install pahole and cross-compilation toolchain in the docker image
-export TARGET_ARCH=$(uname -m)
-export PAHOLE_BRANCH=none
+# Otherwise there is no point in caching the dependencies in the image
+export GCC_VERSION=${GCC_VERSION:-14}
+export LLVM_VERSION=${LLVM_VERSION:-21}
 
 scratch=$(mktemp -d)
 cd $scratch
+
+# Install pre-requisites for GitHub Actions Runner client app
+# https://github.com/actions/runner/blob/main/docs/start/envlinux.md
+curl -Lf https://raw.githubusercontent.com/actions/runner/v${RUNNER_VERSION}/src/Misc/layoutbin/installdependencies.sh \
+     -o install-gha-runner-deps.sh
+bash install-gha-runner-deps.sh
+
+# Use libbpf/ci/setup-build-env scripts
 git clone --depth 1 --branch $LIBBPF_CI_TAG https://github.com/libbpf/ci.git actions
 
-# Install build dependencies only on x86_64, we cross-compile everything else
-if [ "$(uname -m)" == "x86_64" ]; then
+if [ "$DEPS" = "all" ] || [ "$DEPS" = "build" ]; then
+        # do not install cross-compilation toolchain by default
+        export TARGET_ARCH=$(uname -m)
         cd "${scratch}/actions/setup-build-env" && ./action.sh
 fi
 
-cd "${scratch}/actions/run-vmtest" && ./install-dependencies.sh
+if [ "$DEPS" = "all" ] || [ "$DEPS" = "run" ]; then
+        cd "${scratch}/actions/run-vmtest" && ./install-dependencies.sh
+fi
+
+cd / && rm -rf $scratch
+sudo apt-get clean

kbuilder-debian.Dockerfile

@@ -0,0 +1,16 @@
+FROM debian:trixie
+
+ARG RUNNER_VERSION=2.331.0
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    ca-certificates curl git sudo wget
+
+COPY setup-mirror-repos.sh /tmp/setup-mirror-repos.sh
+RUN bash /tmp/setup-mirror-repos.sh
+
+ENV LIBBPF_CI_TAG=debian-build-env
+COPY install-dependencies.sh /tmp/install-dependencies.sh
+RUN bash /tmp/install-dependencies.sh build
+
+RUN apt-get clean

setup-mirror-repos.sh

@@ -2,11 +2,6 @@
 
 set -euo pipefail
 
-if [ "$(uname -m)" != "x86_64" ]; then
-        echo "Skip setting up mirror repos in non-x86_64 image"
-        exit 0
-fi
-
 mkdir -p /libbpfci/mirrors
 git clone https://github.com/kernel-patches/bpf.git /libbpfci/mirrors/linux
 chmod -R a+rX /libbpfci/mirrors