Skip to content

Commit

Permalink
Reorganize list of packages installed on runners
Browse files Browse the repository at this point in the history
Review and clean up the list of packages installed during runner image
build: remove duplicates, use common list between main and s390x
Dockerfiles.

* remove linux-image-generic
* replace python3 with python3-minimal.
* install LLVM with an official automatic script.
* set UBUNTU_VERSION to noble by default

This addresses recent build failures:
* https://github.com/kernel-patches/runner/actions/runs/13058686735
* https://github.com/kernel-patches/runner/actions/runs/13037837932

Signed-off-by: Ihor Solodrai <[email protected]>
  • Loading branch information
theihor committed Jan 31, 2025
1 parent cc3777f commit 030b6d9
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 18 deletions.
26 changes: 16 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
# hadolint ignore=DL3007
ARG UBUNTU_VERSION=focal
ARG UBUNTU_VERSION=noble
FROM myoung34/github-runner:ubuntu-${UBUNTU_VERSION}
# Redefining UBUNTU_VERSION without a value inherits the global default
ARG UBUNTU_VERSION

LABEL maintainer="[email protected]"

RUN apt-get update \
&& apt-get install -y cmake flex bison build-essential libssl-dev ncurses-dev xz-utils bc rsync libguestfs-tools qemu-kvm qemu-utils linux-image-generic zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils \
&& apt-get install -y g++ libelf-dev \
&& apt-get install -y iproute2 iputils-ping \
&& apt-get install -y cpu-checker qemu-kvm qemu-utils qemu-system-x86 qemu-system-s390x qemu-system-arm qemu-guest-agent ethtool keyutils iptables gawk \
&& echo "deb https://apt.llvm.org/${UBUNTU_VERSION}/ llvm-toolchain-${UBUNTU_VERSION} main" > /etc/apt/sources.list.d/llvm.list \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get update \
&& apt-get install -y clang lld llvm
RUN apt-get update -y && apt-get install -y \
bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
rsync sudo tree wget xz-utils zstd

RUN apt-get update -y && apt-get install -y \
binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev

RUN apt-get update -y && apt-get install -y \
qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils

# Install LLVM with automatic script (https://apt.llvm.org)
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

RUN apt-get clean
24 changes: 16 additions & 8 deletions s390x-native.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,23 @@ ARG UBUNTU_VERSION=noble
FROM --platform=linux/s390x ubuntu:${UBUNTU_VERSION}
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get -y install \
bc bison cmake cpu-checker curl dumb-init ethtool flex gawk git \
iproute2 iptables iputils-ping jq keyutils linux-image-generic \
python3 rsync software-properties-common sudo tree wget zstd
RUN apt-get -y install \
qemu-guest-agent qemu-kvm qemu-utils \
qemu-system-arm qemu-system-s390x qemu-system-x86
RUN apt-get install -y \
RUN apt-get update -y && apt-get install -y \
bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
rsync sudo tree wget xz-utils zstd

RUN apt-get update -y && apt-get install -y \
binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev

RUN apt-get update -y && apt-get install -y \
qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils

# Install LLVM with automatic script (https://apt.llvm.org)
RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

RUN apt-get update -y && apt-get install -y \
aspnetcore-runtime-8.0

RUN apt-get clean

ARG version=2.321.0
Expand Down

0 comments on commit 030b6d9

Please sign in to comment.