From 25de838a0af51fa21db06c3c763d9278ebf6a063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 11 Oct 2024 10:13:29 +0200 Subject: [PATCH] dbld: add fedora-41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- .github/workflows/create-packages.yml | 3 ++- .github/workflows/dbld-images.yml | 1 + .github/workflows/packages.yml | 2 +- dbld/Makefile.am | 1 + dbld/images/fedora-41.dockerfile | 27 +++++++++++++++++++++++++++ dbld/rules | 1 + 6 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 dbld/images/fedora-41.dockerfile diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index 4d2d56b76a..5089ecf943 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -27,7 +27,8 @@ on: "almalinux-8", "almalinux-9", "fedora-39", - "fedora-40" + "fedora-40", + "fedora-41" ]' diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml index 10f674ec2f..1873631574 100644 --- a/.github/workflows/dbld-images.yml +++ b/.github/workflows/dbld-images.yml @@ -35,6 +35,7 @@ jobs: - almalinux-8 - fedora-39 - fedora-40 + - fedora-41 - debian-bullseye - debian-bookworm - debian-sid diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 5750d2de83..a65b0b634c 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -38,6 +38,6 @@ jobs: "almalinux-9", "debian-bookworm", "debian-testing", - "fedora-40", + "fedora-41", "ubuntu-noble" ]' diff --git a/dbld/Makefile.am b/dbld/Makefile.am index 10c3da390b..3d54351626 100644 --- a/dbld/Makefile.am +++ b/dbld/Makefile.am @@ -31,6 +31,7 @@ EXTRA_DIST += \ dbld/images/devshell.dockerfile \ dbld/images/fedora-39.dockerfile \ dbld/images/fedora-40.dockerfile \ + dbld/images/fedora-41.dockerfile \ dbld/images/debian-bullseye.dockerfile \ dbld/images/debian-bookworm.dockerfile \ dbld/images/debian-sid.dockerfile \ diff --git a/dbld/images/fedora-41.dockerfile b/dbld/images/fedora-41.dockerfile new file mode 100644 index 0000000000..09b1fb441f --- /dev/null +++ b/dbld/images/fedora-41.dockerfile @@ -0,0 +1,27 @@ +FROM fedora:41 +LABEL maintainer="László Várady , Balazs Scheidler " +ENV OS_DISTRIBUTION=fedora +ENV OS_DISTRIBUTION_CODE_NAME=41 + +ARG ARG_IMAGE_PLATFORM +ARG COMMIT +ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +LABEL COMMIT=${COMMIT} + +COPY images/entrypoint.sh / +COPY . /dbld/ + +RUN /dbld/builddeps update_packages +RUN /dbld/builddeps workaround_rpm_repos +RUN /dbld/builddeps install_dbld_dependencies +RUN /dbld/builddeps add_copr_repo +RUN /dbld/builddeps install_yum_packages +RUN /dbld/builddeps install_rpm_build_deps + +RUN /dbld/builddeps install_criterion +RUN /dbld/builddeps install_gradle + +VOLUME /source +VOLUME /build + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/dbld/rules b/dbld/rules index 353652b16c..a33d394958 100755 --- a/dbld/rules +++ b/dbld/rules @@ -5,6 +5,7 @@ BUILDER_IMAGES= \ almalinux-9 \ fedora-39 \ fedora-40 \ + fedora-41 \ debian-stretch \ debian-bullseye \ debian-bookworm \