From 027e60f6be80f9936762760e40e4219a29396c6d Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 14 Jan 2022 12:12:04 +0100 Subject: [PATCH] add ubuntu jammy build target (cherry picked from commit 6c1e5fd70b4dd4e75b18ff8c75f93c7d22122643) --- .../Dockerfile.target.ubuntu-jammy | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy b/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy new file mode 100644 index 0000000000..d623a956e2 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-jammy @@ -0,0 +1,35 @@ +# First do the source builds +@INCLUDE Dockerfile.target.sdist + +@IF [ ${BUILDER_TARGET} = ubuntu-jammy ] +FROM ubuntu:jammy as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = ubuntu-jammy-amd64 ] +FROM amd64/ubuntu:jammy as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = ubuntu-jammy-arm64 ] +FROM arm64v8/ubuntu:jammy as dist-base +@ENDIF +ARG BUILDER_CACHE_BUSTER= +ARG APT_URL +RUN apt-get update && apt-get -y dist-upgrade + +@INCLUDE Dockerfile.debbuild-prepare + +@IF [ -n "$M_authoritative$M_all" ] +ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/ +@ENDIF + +@IF [ -n "$M_recursor$M_all" ] +ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/ +@ENDIF + +@IF [ -n "$M_dnsdist$M_all" ] +ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/ +@ENDIF + +@INCLUDE Dockerfile.debbuild + +# Do a test install and verify +# Can be skipped with skiptests=1 in the environment +# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest -- 2.39.2