diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index 450b1cd76..5089ecf94 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -21,12 +21,14 @@ on: "ubuntu-focal", "ubuntu-jammy", "ubuntu-noble", + "ubuntu-oracular", "ubuntu-lunar", "ubuntu-mantic", "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 e5d7d8543..187363157 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 @@ -42,6 +43,7 @@ jobs: - ubuntu-focal - ubuntu-jammy - ubuntu-noble + - ubuntu-oracular - ubuntu-lunar - ubuntu-mantic - devshell diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 5750d2de8..a65b0b634 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/.github/workflows/upload-packages.yml b/.github/workflows/upload-packages.yml index a2044d3af..6012f4cff 100644 --- a/.github/workflows/upload-packages.yml +++ b/.github/workflows/upload-packages.yml @@ -18,6 +18,7 @@ on: "ubuntu-focal", "ubuntu-jammy", "ubuntu-noble", + "ubuntu-oracular", "ubuntu-lunar", "ubuntu-mantic" ]' diff --git a/README.md b/README.md index d3e7707a9..f5c959052 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ The following x86-64 distros are supported: | Debian 11 | debian-bullseye | | Debian Unstable | debian-sid | | Debian Testing | debian-testing | +| Ubuntu 24.10 | ubuntu-oracular | | Ubuntu 24.04 | ubuntu-noble | | Ubuntu 23.10 | ubuntu-mantic | | Ubuntu 23.04 | ubuntu-lunar | diff --git a/dbld/Makefile.am b/dbld/Makefile.am index 9b10b8725..3d5435162 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 \ @@ -38,6 +39,7 @@ EXTRA_DIST += \ dbld/images/ubuntu-focal.dockerfile \ dbld/images/ubuntu-jammy.dockerfile \ dbld/images/ubuntu-noble.dockerfile \ + dbld/images/ubuntu-oracular.dockerfile \ dbld/images/ubuntu-lunar.dockerfile \ dbld/images/ubuntu-mantic.dockerfile \ dbld/images/tarball.dockerfile \ diff --git a/dbld/build.manifest b/dbld/build.manifest index 0fdbbc1e1..2b4781973 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -37,7 +37,8 @@ debian-sid python3,nojava # libcriterion-dev is available starting with 21.04 ubuntu-focal python3,nocriterion,nomqtt,nogrpc,notzdatalegacy,nobpf ubuntu-jammy python3,notzdatalegacy,nobpf -ubuntu-noble python3,notzdatalegacy +ubuntu-noble python3 +ubuntu-oracular python3 ubuntu-lunar python3 ubuntu-mantic python3 diff --git a/dbld/images/almalinux-8.dockerfile b/dbld/images/almalinux-8.dockerfile index 396ffe811..41604b773 100644 --- a/dbld/images/almalinux-8.dockerfile +++ b/dbld/images/almalinux-8.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=8 ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / diff --git a/dbld/images/almalinux-9.dockerfile b/dbld/images/almalinux-9.dockerfile index 14e6ae601..acf1813c2 100644 --- a/dbld/images/almalinux-9.dockerfile +++ b/dbld/images/almalinux-9.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=9 ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / diff --git a/dbld/images/centos-7.dockerfile b/dbld/images/centos-7.dockerfile index eb98cbd1c..d1b0c1f23 100644 --- a/dbld/images/centos-7.dockerfile +++ b/dbld/images/centos-7.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=7 ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / diff --git a/dbld/images/debian-bookworm.dockerfile b/dbld/images/debian-bookworm.dockerfile index 027147240..636133b52 100644 --- a/dbld/images/debian-bookworm.dockerfile +++ b/dbld/images/debian-bookworm.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=bookworm ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/debian-bullseye.dockerfile b/dbld/images/debian-bullseye.dockerfile index bdd929910..b2996c941 100644 --- a/dbld/images/debian-bullseye.dockerfile +++ b/dbld/images/debian-bullseye.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=bullseye ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/debian-sid.dockerfile b/dbld/images/debian-sid.dockerfile index 374cbc50f..dae0cda4d 100644 --- a/dbld/images/debian-sid.dockerfile +++ b/dbld/images/debian-sid.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=sid ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/debian-testing.dockerfile b/dbld/images/debian-testing.dockerfile index bb99d4587..0310bee49 100644 --- a/dbld/images/debian-testing.dockerfile +++ b/dbld/images/debian-testing.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=testing ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/devshell.dockerfile b/dbld/images/devshell.dockerfile index 4b9a18619..b6db252b1 100644 --- a/dbld/images/devshell.dockerfile +++ b/dbld/images/devshell.dockerfile @@ -3,7 +3,7 @@ FROM $CONTAINER_REGISTRY/axosyslog-dbld-tarball:latest ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} diff --git a/dbld/images/fedora-39.dockerfile b/dbld/images/fedora-39.dockerfile index 54454d99d..4f55a256a 100644 --- a/dbld/images/fedora-39.dockerfile +++ b/dbld/images/fedora-39.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=39 ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / diff --git a/dbld/images/fedora-40.dockerfile b/dbld/images/fedora-40.dockerfile index 3e28899c9..38c24c1c8 100644 --- a/dbld/images/fedora-40.dockerfile +++ b/dbld/images/fedora-40.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=40 ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} COPY images/entrypoint.sh / diff --git a/dbld/images/fedora-41.dockerfile b/dbld/images/fedora-41.dockerfile new file mode 100644 index 000000000..1b6b139a5 --- /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/images/tarball.dockerfile b/dbld/images/tarball.dockerfile index 4cb86e5ab..6e62b3dbb 100644 --- a/dbld/images/tarball.dockerfile +++ b/dbld/images/tarball.dockerfile @@ -3,7 +3,7 @@ FROM $CONTAINER_REGISTRY/axosyslog-dbld-debian-testing:latest ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} RUN /dbld/builddeps install_apt_packages diff --git a/dbld/images/ubuntu-focal.dockerfile b/dbld/images/ubuntu-focal.dockerfile index cf1901cbd..011440047 100644 --- a/dbld/images/ubuntu-focal.dockerfile +++ b/dbld/images/ubuntu-focal.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=focal ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/ubuntu-jammy.dockerfile b/dbld/images/ubuntu-jammy.dockerfile index ff893132e..fbdd358a2 100644 --- a/dbld/images/ubuntu-jammy.dockerfile +++ b/dbld/images/ubuntu-jammy.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=jammy ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/ubuntu-lunar.dockerfile b/dbld/images/ubuntu-lunar.dockerfile index a729d21b0..09b21ad0b 100644 --- a/dbld/images/ubuntu-lunar.dockerfile +++ b/dbld/images/ubuntu-lunar.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=lunar ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/ubuntu-mantic.dockerfile b/dbld/images/ubuntu-mantic.dockerfile index 9f2325381..b21bf030e 100644 --- a/dbld/images/ubuntu-mantic.dockerfile +++ b/dbld/images/ubuntu-mantic.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=mantic ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/ubuntu-noble.dockerfile b/dbld/images/ubuntu-noble.dockerfile index a8631d85d..1293e6151 100644 --- a/dbld/images/ubuntu-noble.dockerfile +++ b/dbld/images/ubuntu-noble.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=noble ARG ARG_IMAGE_PLATFORM ARG COMMIT -ENV IMAGE_PLATFORM ${ARG_IMAGE_PLATFORM} +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} LABEL COMMIT=${COMMIT} ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NONINTERACTIVE_SEEN=true -ENV LANG C.UTF-8 +ENV LANG=C.UTF-8 COPY images/entrypoint.sh / COPY . /dbld/ diff --git a/dbld/images/ubuntu-oracular.dockerfile b/dbld/images/ubuntu-oracular.dockerfile new file mode 100644 index 000000000..f306997ee --- /dev/null +++ b/dbld/images/ubuntu-oracular.dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu:oracular +LABEL maintainer="Laszlo Varady " +ENV OS_DISTRIBUTION=ubuntu +ENV OS_DISTRIBUTION_CODE_NAME=oracular + +ARG ARG_IMAGE_PLATFORM +ARG COMMIT +ENV IMAGE_PLATFORM=${ARG_IMAGE_PLATFORM} +LABEL COMMIT=${COMMIT} + +ENV DEBIAN_FRONTEND=noninteractive +ENV DEBCONF_NONINTERACTIVE_SEEN=true +ENV LANG=C.UTF-8 + +COPY images/entrypoint.sh / +COPY . /dbld/ + +RUN /dbld/builddeps update_packages +RUN /dbld/builddeps install_dbld_dependencies +RUN /dbld/builddeps install_apt_packages +RUN /dbld/builddeps install_debian_build_deps + +VOLUME /source +VOLUME /build + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/dbld/rules b/dbld/rules index f9c0d7307..a33d39495 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 \ @@ -13,6 +14,7 @@ BUILDER_IMAGES= \ ubuntu-focal \ ubuntu-jammy \ ubuntu-noble \ + ubuntu-oracular \ ubuntu-lunar \ ubuntu-mantic \ tarball