diff --git a/Jenkinsfile b/Jenkinsfile index ffad6bbc4b..ee75499c03 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,6 @@ def pkgs = [ [target: "debian-bullseye", image: "debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (oldstable, EOL: 2024-08-14, EOL (LTS): 2026-08-31) [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (stable, EOL: 2026-06-10, EOL (LTS): 2028-06-30) [target: "debian-trixie", image: "debian:trixie", arches: ["amd64", "aarch64", "armhf"]], // Debian 13 (testing) - [target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025 [target: "fedora-41", image: "fedora:41", arches: ["amd64", "aarch64"]], // EOL: November 19, 2025 [target: "fedora-42", image: "fedora:42", arches: ["amd64", "aarch64"]], // EOL: May 13, 2026 [target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable) diff --git a/rpm/Makefile b/rpm/Makefile index 150e33fcfd..98565f67ff 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -64,7 +64,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) -FEDORA_RELEASES ?= fedora-40 fedora-41 fedora-42 +FEDORA_RELEASES ?= fedora-41 fedora-42 CENTOS_RELEASES ?= centos-9 centos-10 RHEL_RELEASES ?= rhel-8 rhel-9 diff --git a/rpm/fedora-40/Dockerfile b/rpm/fedora-40/Dockerfile deleted file mode 100644 index 1fa0e8c2c1..0000000000 --- a/rpm/fedora-40/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=fedora -ARG SUITE=40 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} -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 -ENV AUTO_GOPATH=1 -ARG DISTRO -ARG SUITE -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -RUN dnf install -y rpm-build dnf-plugins-core -COPY --link SPECS /root/rpmbuild/SPECS -RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec -COPY --link --from=golang /usr/local/go /usr/local/go -WORKDIR /root/rpmbuild -ENTRYPOINT ["/bin/rpmbuild"]