From a6edf1ddc1aab04a450804e2f49f4357b42e1275 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:06 +0200 Subject: [PATCH 1/4] dbld: add ubuntu-oracular 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 | 1 + .github/workflows/dbld-images.yml | 1 + .github/workflows/upload-packages.yml | 1 + README.md | 1 + dbld/Makefile.am | 1 + dbld/build.manifest | 1 + dbld/images/ubuntu-oracular.dockerfile | 26 ++++++++++++++++++++++++++ dbld/rules | 1 + 8 files changed, 33 insertions(+) create mode 100644 dbld/images/ubuntu-oracular.dockerfile diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index 450b1cd767..4d2d56b76a 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -21,6 +21,7 @@ on: "ubuntu-focal", "ubuntu-jammy", "ubuntu-noble", + "ubuntu-oracular", "ubuntu-lunar", "ubuntu-mantic", "almalinux-8", diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml index e5d7d85437..10f674ec2f 100644 --- a/.github/workflows/dbld-images.yml +++ b/.github/workflows/dbld-images.yml @@ -42,6 +42,7 @@ jobs: - ubuntu-focal - ubuntu-jammy - ubuntu-noble + - ubuntu-oracular - ubuntu-lunar - ubuntu-mantic - devshell diff --git a/.github/workflows/upload-packages.yml b/.github/workflows/upload-packages.yml index a2044d3afe..6012f4cff2 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 d3e7707a9f..f5c959052e 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 9b10b87252..10c3da390b 100644 --- a/dbld/Makefile.am +++ b/dbld/Makefile.am @@ -38,6 +38,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 0fdbbc1e18..f10569fa59 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -38,6 +38,7 @@ debian-sid python3,nojava ubuntu-focal python3,nocriterion,nomqtt,nogrpc,notzdatalegacy,nobpf ubuntu-jammy python3,notzdatalegacy,nobpf ubuntu-noble python3,notzdatalegacy +ubuntu-oracular python3,notzdatalegacy ubuntu-lunar python3 ubuntu-mantic python3 diff --git a/dbld/images/ubuntu-oracular.dockerfile b/dbld/images/ubuntu-oracular.dockerfile new file mode 100644 index 0000000000..ae73912ee2 --- /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 f9c0d7307a..353652b16c 100755 --- a/dbld/rules +++ b/dbld/rules @@ -13,6 +13,7 @@ BUILDER_IMAGES= \ ubuntu-focal \ ubuntu-jammy \ ubuntu-noble \ + ubuntu-oracular \ ubuntu-lunar \ ubuntu-mantic \ tarball 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 2/4] 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 \ From 84d487e48be73ef6453df71cb51e557be4ba5bcb 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:57:21 +0200 Subject: [PATCH 3/4] dbld: fix LegacyKeyValueFormat in Dockerfiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- dbld/images/almalinux-8.dockerfile | 2 +- dbld/images/almalinux-9.dockerfile | 2 +- dbld/images/centos-7.dockerfile | 2 +- dbld/images/debian-bookworm.dockerfile | 4 ++-- dbld/images/debian-bullseye.dockerfile | 4 ++-- dbld/images/debian-sid.dockerfile | 4 ++-- dbld/images/debian-testing.dockerfile | 4 ++-- dbld/images/devshell.dockerfile | 2 +- dbld/images/fedora-39.dockerfile | 2 +- dbld/images/fedora-40.dockerfile | 2 +- dbld/images/fedora-41.dockerfile | 2 +- dbld/images/tarball.dockerfile | 2 +- dbld/images/ubuntu-focal.dockerfile | 4 ++-- dbld/images/ubuntu-jammy.dockerfile | 4 ++-- dbld/images/ubuntu-lunar.dockerfile | 4 ++-- dbld/images/ubuntu-mantic.dockerfile | 4 ++-- dbld/images/ubuntu-noble.dockerfile | 4 ++-- dbld/images/ubuntu-oracular.dockerfile | 4 ++-- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dbld/images/almalinux-8.dockerfile b/dbld/images/almalinux-8.dockerfile index 396ffe811a..41604b773c 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 14e6ae6013..acf1813c28 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 eb98cbd1c9..d1b0c1f233 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 027147240d..636133b52a 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 bdd9299104..b2996c941b 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 374cbc50fd..dae0cda4d7 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 bb99d4587c..0310bee490 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 4b9a186191..b6db252b15 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 54454d99d7..4f55a256a3 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 3e28899c9f..38c24c1c8e 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 index 09b1fb441f..1b6b139a53 100644 --- a/dbld/images/fedora-41.dockerfile +++ b/dbld/images/fedora-41.dockerfile @@ -5,7 +5,7 @@ ENV OS_DISTRIBUTION_CODE_NAME=41 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/tarball.dockerfile b/dbld/images/tarball.dockerfile index 4cb86e5aba..6e62b3dbb6 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 cf1901cbda..011440047e 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 ff893132e7..fbdd358a24 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 a729d21b09..09b21ad0b6 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 9f23253819..b21bf030e2 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 a8631d85dc..1293e6151a 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 index ae73912ee2..f306997eee 100644 --- a/dbld/images/ubuntu-oracular.dockerfile +++ b/dbld/images/ubuntu-oracular.dockerfile @@ -5,12 +5,12 @@ ENV OS_DISTRIBUTION_CODE_NAME=oracular 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/ From 2881ae0592a0e0bdac3fbec1e6a4597484e5d5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 11 Oct 2024 11:14:46 +0200 Subject: [PATCH 4/4] dbld: remove notzdatalegacy flag from ubuntu-nobel and ubuntu-oracular MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- dbld/build.manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbld/build.manifest b/dbld/build.manifest index f10569fa59..2b47819732 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -37,8 +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-oracular python3,notzdatalegacy +ubuntu-noble python3 +ubuntu-oracular python3 ubuntu-lunar python3 ubuntu-mantic python3