diff --git a/deb/Makefile b/deb/Makefile index f79529b215..8a5b405946 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_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-plucky ubuntu-questing RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/ubuntu-questing/Dockerfile b/deb/ubuntu-questing/Dockerfile new file mode 100644 index 0000000000..d5a102bc11 --- /dev/null +++ b/deb/ubuntu-questing/Dockerfile @@ -0,0 +1,46 @@ +# syntax=docker/dockerfile:1 + +ARG GO_IMAGE=golang:latest +ARG DISTRO=ubuntu +ARG SUITE=questing +ARG VERSION_ID=25.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=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 c24cbf0366..6fe3ab1bd4 100644 --- a/distros.json +++ b/distros.json @@ -115,6 +115,17 @@ "end_of_life": "01-2026", "end_of_support": "01-2026" }, + "ubuntu-questing": { + "image": "ubuntu:questing", + "arches": [ + "amd64", + "aarch64", + "armhf" + ], + "description": "Ubuntu 25.10", + "end_of_life": "26-06-2026", + "end_of_support": "26-06-2026" + }, "rhel-8": { "image": "registry.access.redhat.com/ubi8/ubi", "arches": [