diff --git a/deb/Makefile b/deb/Makefile index 8a5b405946..aba4a247d4 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -54,7 +54,7 @@ RUN?=docker run --rm \ debbuild-$@/$(ARCH) DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie -UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-plucky ubuntu-questing +UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-questing RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/ubuntu-plucky/Dockerfile b/deb/ubuntu-plucky/Dockerfile deleted file mode 100644 index 5adf08e82f..0000000000 --- a/deb/ubuntu-plucky/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=ubuntu -ARG SUITE=plucky -ARG VERSION_ID=25.04 -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=on -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"] diff --git a/distros.json b/distros.json index cb88871c76..d9a2c44a7a 100644 --- a/distros.json +++ b/distros.json @@ -90,17 +90,6 @@ "end_of_life": "04-2034", "end_of_support": "06-2029" }, - "ubuntu-plucky": { - "image": "ubuntu:plucky", - "arches": [ - "amd64", - "aarch64", - "armhf" - ], - "description": "Ubuntu 25.04", - "end_of_life": "01-2026", - "end_of_support": "01-2026" - }, "ubuntu-questing": { "image": "ubuntu:questing", "arches": [