CI: Refresh and upgrade the Fedora container

Fedora 29 is long out of date.  Move forward 5 years to Fedora 40.

Include all the usual improvements.  Rework the container to be non-root, use
heredocs for legibility, and switch to the new naming scheme.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Javi Merino <javi.merino@cloud.com>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Andrew Cooper committed 2024-10-18 10:56:41 +01:00
1 parent d84f6870fe
commit 6e085825cb
4 files changed
+82 -51

No files matched your search

-46
View File
@@ -1,46 +0,0 @@
# syntax=docker/dockerfile:1
FROM --platform=linux/amd64 fedora:29
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
# install Xen depends
RUN dnf -y install \
clang \
gcc \
gcc-c++ \
ncurses-devel \
zlib-devel \
python-devel \
python3-devel \
libuuid-devel \
pkgconfig \
flex \
bison \
libaio-devel \
glib2-devel \
yajl-devel \
pixman-devel \
glibc-devel \
make \
binutils \
git \
wget \
acpica-tools \
python-markdown \
patch \
checkpolicy \
dev86 \
xz-devel \
bzip2 \
nasm \
ocaml \
ocaml-findlib \
golang \
# QEMU
ninja-build \
&& dnf clean all && \
rm -rf /var/cache/dnf
RUN useradd --create-home user
USER user
WORKDIR /build
@@ -0,0 +1,77 @@
# syntax=docker/dockerfile:1
FROM --platform=linux/amd64 fedora:40
LABEL maintainer.name="The Xen Project"
LABEL maintainer.email="xen-devel@lists.xenproject.org"
RUN <<EOF
set -e
useradd --create-home user
dnf -y update
DEPS=(
# Xen
binutils
gcc
make
python3
# Kconfig
bison
flex
# Flask
checkpolicy
# Tools (general)
git-core
gzip
patch
perl-interpreter
perl-File-Find
pkgconfig
wget
# libxenguest dombuilder
bzip2-devel
libzstd-devel
lzo-devel
xz-devel
zlib-devel
# libacpi
acpica-tools
# libxl
libuuid-devel
yajl-devel
# xen-foreign
diffutils
# RomBIOS
dev86
# Header Check
gcc-c++
# xentop
ncurses-devel
# Python bindings
python3-devel
python3-setuptools
# Ocaml bindings/oxenstored
ocaml
ocaml-findlib
# Golang bindings
golang
# Stubdom download/extract
bzip2
# Qemu build
glib2-devel
pixman-devel
ninja-build
)
dnf -y --setopt=install_weak_deps=False install "${DEPS[@]}"
dnf clean all
rm -rf /var/cache/dnf
EOF
USER user
WORKDIR /build
+4 -4
View File
@@ -579,15 +579,15 @@ debian-bookworm-32-gcc-debug:
variables:
CONTAINER: debian:bookworm-i386
fedora-gcc:
fedora-40-x86_64-gcc:
extends: .gcc-x86-64-build
variables:
CONTAINER: fedora:29
CONTAINER: fedora:40-x86_64
fedora-gcc-debug:
fedora-40-x86_64-gcc-debug:
extends: .gcc-x86-64-build-debug
variables:
CONTAINER: fedora:29
CONTAINER: fedora:40-x86_64
ubuntu-16.04-x86_64-clang:
extends: .clang-x86-64-build
+1 -1
View File
@@ -28,7 +28,7 @@ case "_${CONTAINER}" in
_alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;;
_archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
_centos7) CONTAINER="${BASE}/centos:7" ;;
_fedora) CONTAINER="${BASE}/fedora:29";;
_fedora) CONTAINER="${BASE}/fedora:40-x86_64";;
_bullseye-ppc64le) CONTAINER="${BASE}/debian:11-ppc64le" ;;
_bookworm-ppc64le) CONTAINER="${BASE}/debian:12-ppc64le" ;;
_bullseye-riscv64) CONTAINER="${BASE}/debian:11-riscv64" ;;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.