From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 17 Oct 2019 21:19:15 +0000 (+0200)
Subject: builder: demand user chooses a module except when building docs
X-Git-Tag: auth-4.3.0-alpha1~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4307e04bfad9f735fce202fda78c5bb4cdb943;p=thirdparty%2Fpdns.git

builder: demand user chooses a module except when building docs
---

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild
index 1a8acdf173..e0458f3109 100644
--- a/builder-support/dockerfiles/Dockerfile.debbuild
+++ b/builder-support/dockerfiles/Dockerfile.debbuild
@@ -1,4 +1,4 @@
-@IF [ ! -z "$M_authoritative$M_all" ]
+@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; \
@@ -9,13 +9,13 @@ RUN PDNS_TEST_NO_IPV6=1 builder/helpers/build-debs.sh pdns-${BUILDER_VERSION}
 RUN mv pdns*.deb /dist; mv pdns*.ddeb /dist || true
 @ENDIF
 
-@IF [ ! -z "$M_recursor$M_all" ]
+@IF [ ! -z "$M_recursor" ]
 RUN builder/helpers/build-debs.sh pdns-recursor-${BUILDER_VERSION}
 
 RUN mv pdns-recursor*.deb /dist; mv pdns-recursor*.ddeb /dist || true
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist$M_all" ]
+@IF [ ! -z "$M_dnsdist" ]
 RUN builder/helpers/build-debs.sh dnsdist-${BUILDER_VERSION}
 
 RUN mv dnsdist*.deb /dist; mv dnsdist*.ddeb /dist || true
diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index ea285a0b4e..4f48621df5 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -21,7 +21,7 @@ RUN for file in /sdist/* ; do ln -s $file /root/rpmbuild/SOURCES/ ; done && ls /
 ADD builder-support/specs/ /pdns/builder-support/specs
 RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/rpmbuild/SOURCES/ \;
 
-@IF [ ! -z "$M_authoritative$M_all" ]
+@IF [ ! -z "$M_authoritative" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/pdns.spec; \
     else \
@@ -29,7 +29,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
-@IF [ ! -z "$M_recursor$M_all" ]
+@IF [ ! -z "$M_recursor" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec; \
     else \
@@ -37,7 +37,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     fi
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist$M_all" ]
+@IF [ ! -z "$M_dnsdist" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       true ; \
     else \
diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist
index eb310ea109..97fa23512f 100644
--- a/builder-support/dockerfiles/Dockerfile.target.sdist
+++ b/builder-support/dockerfiles/Dockerfile.target.sdist
@@ -1,20 +1,20 @@
-@IF [ ! -z "$M_authoritative$M_all" ]
+@IF [ ! -z "$M_authoritative" ]
 @INCLUDE Dockerfile.authoritative
 @ENDIF
 
-@IF [ ! -z "$M_recursor$M_all" ]
+@IF [ ! -z "$M_recursor" ]
 @INCLUDE Dockerfile.recursor
 @ENDIF
 
-@IF [ ! -z "$M_dnsdist$M_all" ]
+@IF [ ! -z "$M_dnsdist" ]
 @INCLUDE Dockerfile.dnsdist
 @ENDIF
 
 FROM alpine:3.10 as sdist
 ARG BUILDER_CACHE_BUSTER=
 
-@IF [ -z "$M_all$M_authoritative$M_recursor$M_dnsdist"]
-RUN echo "no valid modules specified!" ; exit 1
+@IF [ -z "$M_authoritative$M_recursor$M_dnsdist"]
+RUN echo "no valid module specified! - please pick just one using -m {authoritative|recursor|dnsdist}" ; exit 1
 @ENDIF
 
 @IF [ ! -z "$M_authoritative$M_all" ]