From 77dbb2a6393db591334d2125f035a7f2ff762164 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 3 Jul 2023 18:01:01 +0200 Subject: [PATCH] builder: add debian-trixie target --- .../Dockerfile.target.debian-trixie | 36 +++++++++++++++++++ .../Dockerfile.target.debian-trixie-amd64 | 1 + .../Dockerfile.target.debian-trixie-arm64 | 1 + 3 files changed, 38 insertions(+) create mode 100644 builder-support/dockerfiles/Dockerfile.target.debian-trixie create mode 120000 builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64 create mode 120000 builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64 diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie b/builder-support/dockerfiles/Dockerfile.target.debian-trixie new file mode 100644 index 0000000000..0c23eb98b0 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-trixie @@ -0,0 +1,36 @@ +# First do the source builds +@INCLUDE Dockerfile.target.sdist + +@IF [ ${BUILDER_TARGET} = debian-trixie ] +FROM debian:trixie as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = debian-trixie-amd64 ] +FROM amd64/debian:trixie as dist-base +@ENDIF +@IF [ ${BUILDER_TARGET} = debian-trixie-arm64 ] +FROM arm64v8/debian:trixie 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 diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64 b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64 new file mode 120000 index 0000000000..fed04d5f74 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-amd64 @@ -0,0 +1 @@ +Dockerfile.target.debian-trixie \ No newline at end of file diff --git a/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64 b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64 new file mode 120000 index 0000000000..fed04d5f74 --- /dev/null +++ b/builder-support/dockerfiles/Dockerfile.target.debian-trixie-arm64 @@ -0,0 +1 @@ +Dockerfile.target.debian-trixie \ No newline at end of file -- 2.47.3