From 717529a68c893fb1a54d4d8bc8f600763055cad5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 24 Jul 2024 14:53:45 +0200 Subject: [PATCH] remove Ubuntu 23.10 (Mantic Minotaur) (EOL: July 11, 2024) Ubuntu 23.10 reached EOL on July 11, 2024: https://fridge.ubuntu.com/2024/07/17/ubuntu-23-10-mantic-minotaur-reached-end-of-life-on-july-11-2024/ Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 - deb/Makefile | 2 +- deb/ubuntu-mantic/Dockerfile | 46 ------------------------------------ 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 deb/ubuntu-mantic/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 06c3a16958..f316b4a93e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,6 @@ def pkgs = [ [target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm", arches: ["armhf"]], // Debian/Raspbian 12 (next stable) [target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030) [target: "ubuntu-jammy", image: "ubuntu:jammy", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.04 LTS (End of support: June, 2027. EOL: April, 2032) - [target: "ubuntu-mantic", image: "ubuntu:mantic", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 23.10 (EOL: July, 2024) [target: "ubuntu-noble", image: "ubuntu:noble", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.04 LTS (End of support: June, 2029. EOL: April, 2034) ] diff --git a/deb/Makefile b/deb/Makefile index ea24a4a395..d2a08ae64d 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -49,7 +49,7 @@ RUN?=docker run --rm \ debbuild-$@/$(ARCH) DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm -UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-mantic ubuntu-noble +UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-noble RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/ubuntu-mantic/Dockerfile b/deb/ubuntu-mantic/Dockerfile deleted file mode 100644 index 7af991d426..0000000000 --- a/deb/ubuntu-mantic/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE -ARG DISTRO=ubuntu -ARG SUITE=mantic -ARG VERSION_ID=23.10 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} - -# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639 -RUN if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \ - rm -f /usr/bin/man; \ - dpkg-divert --quiet --remove --rename /usr/bin/man; \ - fi - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y curl devscripts equivs git - -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH /go -ENV GOTOOLCHAIN=local -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin - -ARG COMMON_FILES -COPY --link ${COMMON_FILES} /root/build-deb/debian -RUN apt-get update \ - && mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control - -COPY --link sources/ /sources -ARG DISTRO -ARG SUITE -ARG VERSION_ID -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -ENV VERSION_ID=${VERSION_ID} - -COPY --link --from=golang /usr/local/go /usr/local/go - -WORKDIR /root/build-deb -COPY build-deb /root/build-deb/build-deb - -ENTRYPOINT ["/root/build-deb/build-deb"]