From 7a4996ef26d2bdbb156e4b17ed1ab4ecbbf63248 Mon Sep 17 00:00:00 2001 From: Attila Szakacs Date: Tue, 26 Nov 2024 14:50:56 +0100 Subject: [PATCH] dbld: remove Ubuntu Lunar EOL since 2024 January. https://wiki.ubuntu.com/Releases Signed-off-by: Attila Szakacs --- .github/workflows/create-packages.yml | 1 - .github/workflows/dbld-images.yml | 1 - .github/workflows/test-apt-packages.yml | 1 - .github/workflows/upload-packages.yml | 1 - README.md | 1 - dbld/Makefile.am | 1 - dbld/images/ubuntu-lunar.dockerfile | 26 ------------------------- dbld/rules | 1 - 8 files changed, 33 deletions(-) delete mode 100644 dbld/images/ubuntu-lunar.dockerfile diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml index cfd90dee1..629dbfb9e 100644 --- a/.github/workflows/create-packages.yml +++ b/.github/workflows/create-packages.yml @@ -22,7 +22,6 @@ on: "ubuntu-jammy", "ubuntu-noble", "ubuntu-oracular", - "ubuntu-lunar", "almalinux-8", "almalinux-9", "fedora-39", diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml index 044f926c7..29660ed94 100644 --- a/.github/workflows/dbld-images.yml +++ b/.github/workflows/dbld-images.yml @@ -44,7 +44,6 @@ jobs: - ubuntu-jammy - ubuntu-noble - ubuntu-oracular - - ubuntu-lunar - devshell - tarball fail-fast: false diff --git a/.github/workflows/test-apt-packages.yml b/.github/workflows/test-apt-packages.yml index ee5c5502e..258c87eb6 100644 --- a/.github/workflows/test-apt-packages.yml +++ b/.github/workflows/test-apt-packages.yml @@ -23,7 +23,6 @@ jobs: - "ubuntu:focal" - "ubuntu:jammy" - "ubuntu:noble" - - "ubuntu:lunar" - "ubuntu:oracular" upgrade-from: - "debian-official" diff --git a/.github/workflows/upload-packages.yml b/.github/workflows/upload-packages.yml index 159629d81..0b0d25ad1 100644 --- a/.github/workflows/upload-packages.yml +++ b/.github/workflows/upload-packages.yml @@ -20,7 +20,6 @@ on: {"type": "deb", "name": "ubuntu-jammy"}, {"type": "deb", "name": "ubuntu-noble"}, {"type": "deb", "name": "ubuntu-oracular"}, - {"type": "deb", "name": "ubuntu-lunar"}, {"type": "rpm", "name": "almalinux-8"}, {"type": "rpm", "name": "almalinux-9"}, diff --git a/README.md b/README.md index 69f5cf280..b49651765 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,6 @@ The following x86-64 distros are supported: | Debian Testing | debian-testing | | Ubuntu 24.10 | ubuntu-oracular | | Ubuntu 24.04 | ubuntu-noble | -| Ubuntu 23.04 | ubuntu-lunar | | Ubuntu 22.04 | ubuntu-jammy | | Ubuntu 20.04 | ubuntu-focal | diff --git a/dbld/Makefile.am b/dbld/Makefile.am index a52be06dc..1b39a76fc 100644 --- a/dbld/Makefile.am +++ b/dbld/Makefile.am @@ -40,7 +40,6 @@ EXTRA_DIST += \ dbld/images/ubuntu-jammy.dockerfile \ dbld/images/ubuntu-noble.dockerfile \ dbld/images/ubuntu-oracular.dockerfile \ - dbld/images/ubuntu-lunar.dockerfile \ dbld/images/tarball.dockerfile \ dbld/images/hooks/build \ dbld/images/README.md \ diff --git a/dbld/images/ubuntu-lunar.dockerfile b/dbld/images/ubuntu-lunar.dockerfile deleted file mode 100644 index 09b21ad0b..000000000 --- a/dbld/images/ubuntu-lunar.dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:lunar -LABEL maintainer="Laszlo Varady , Andras Mitzki , Laszlo Szemere , Balazs Scheidler " -ENV OS_DISTRIBUTION=ubuntu -ENV OS_DISTRIBUTION_CODE_NAME=lunar - -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 3d9f0128b..a39431df8 100755 --- a/dbld/rules +++ b/dbld/rules @@ -15,7 +15,6 @@ BUILDER_IMAGES= \ ubuntu-jammy \ ubuntu-noble \ ubuntu-oracular \ - ubuntu-lunar \ tarball IMAGES=${BUILDER_IMAGES} devshell