From b4f4b1ab4ba666fe16f0201b38778fe66dc8e7ae Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 25 Mar 2020 11:41:15 +0100
Subject: [PATCH] builder: add ubuntu focal target

---
 .../dockerfiles/Dockerfile.debbuild-prepare   |  2 +-
 .../Dockerfile.target.ubuntu-focal            | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-focal

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
index a043b26bbc..7bbbc37ed8 100644
--- a/builder-support/dockerfiles/Dockerfile.debbuild-prepare
+++ b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
@@ -1,6 +1,6 @@
 FROM dist-base as package-builder
 ARG APT_URL
-RUN apt-get -y install devscripts dpkg-dev build-essential python3 equivs
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install devscripts dpkg-dev build-essential python3 equivs
 
 RUN mkdir /dist /pdns
 WORKDIR /pdns
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
new file mode 100644
index 0000000000..77e9afd60d
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-focal
@@ -0,0 +1,27 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+FROM ubuntu:focal as dist-base
+ARG BUILDER_CACHE_BUSTER=
+ARG APT_URL
+RUN apt-get update && apt-get -y dist-upgrade
+
+@INCLUDE Dockerfile.debbuild-prepare
+
+@IF [ ! -z "$M_authoritative" ]
+ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
+@ENDIF
+
+@IF [ ! -z "$M_recursor" ]
+ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
+@ENDIF
+
+@IF [ ! -z "$M_dnsdist" ]
+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.47.2