From 46c70bbf8804aa87ffb40f103976dab6d4bbe98c Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 14 Dec 2017 17:19:19 +0100
Subject: [PATCH] builder: add Ubuntu Artful auth target

---
 builder-support/dockerfiles/Dockerfile.debbuild  |  2 ++
 .../dockerfiles/Dockerfile.debbuild-prepare      |  4 +++-
 .../dockerfiles/Dockerfile.target.ubuntu-artful  | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-artful

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild
index 0c150a5ad..b38b80f00 100644
--- a/builder-support/dockerfiles/Dockerfile.debbuild
+++ b/builder-support/dockerfiles/Dockerfile.debbuild
@@ -1,3 +1,4 @@
+@IF [ ! -z "$M_authoritative" ]
 RUN if $(echo ${BUILDER_VERSION} | grep -q -E '^0\.0\.'); then \
   # make sure we don't break dependencies for master releases \
   sed -i '/pdns-server (<< .*/d' pdns-${BUILDER_VERSION}/debian/control; \
@@ -6,3 +7,4 @@ fi
 RUN PDNS_TEST_NO_IPV6=1 builder/helpers/build-debs.sh pdns-${BUILDER_VERSION}
 
 RUN mv pdns*${BUILDER_VERSION}*.deb /dist
+@ENDIF
diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
index 18b9861a5..feba1723f 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
+RUN apt-get -y install devscripts dpkg-dev build-essential python3 equivs
 
 RUN mkdir /dist /pdns
 WORKDIR /pdns
@@ -15,4 +15,6 @@ ARG BUILDER_RELEASE
 
 COPY --from=sdist /sdist /sdist
 
+@IF [ ! -z "$M_authoritative" ]
 RUN tar xvf /sdist/pdns-${BUILDER_VERSION}.tar.bz2
+@ENDIF
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-artful b/builder-support/dockerfiles/Dockerfile.target.ubuntu-artful
new file mode 100644
index 000000000..7f02ad982
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-artful
@@ -0,0 +1,16 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+FROM ubuntu:artful as dist-base
+ARG APT_URL
+RUN apt-get update && apt-get -y dist-upgrade
+
+@INCLUDE Dockerfile.debbuild-prepare
+
+ADD builder-support/debian/debian-stretch/ pdns-${BUILDER_VERSION}/debian/
+
+@INCLUDE Dockerfile.debbuild
+
+# Do a test install and verify
+# Can be skipped with skiptests=1 in the environment
+# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest
-- 
2.40.0