From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 30 Oct 2020 11:13:21 +0000 (+0100)
Subject: install git and unignore .git so --version works
X-Git-Tag: auth-4.4.0-alpha2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07c957dba88c861ee93110e17517d59d068a72c3;p=thirdparty%2Fpdns.git

install git and unignore .git so --version works
---

diff --git a/.dockerignore b/.dockerignore
index 0ce8025a1e..bc83bcdb41 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 builder/tmp
 built_pkgs
-.git
 Dockerfile-*
 .dockerignore
 Makefile.docker
diff --git a/Dockerfile-auth b/Dockerfile-auth
index 6204d45637..4fedfd71b5 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -7,7 +7,7 @@ FROM debian:10-slim AS builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
 # devscripts gives us mk-build-deps (and a lot of other stuff)
-RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts equivs && apt-get clean
+RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts equivs git && apt-get clean
 
 # import everything - this could be pdns.git OR an auth tarball!
 COPY . /source
@@ -22,7 +22,7 @@ WORKDIR /source/
 ARG MAKEFLAGS=
 ENV MAKEFLAGS ${MAKEFLAGS:--j2}
 
-RUN autoreconf -vfi
+RUN BUILDER_MODULES=authoritative autoreconf -vfi
 
 # simplify repeated -C calls with SUBDIRS?
 RUN mkdir /build && \
diff --git a/Dockerfile-dnsdist b/Dockerfile-dnsdist
index 88b3d2df05..444841e6d0 100644
--- a/Dockerfile-dnsdist
+++ b/Dockerfile-dnsdist
@@ -7,7 +7,7 @@ FROM debian:10-slim AS builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
 # devscripts gives us mk-build-deps (and a lot of other stuff)
-RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts equivs && apt-get clean
+RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts equivs git && apt-get clean
 
 # import everything - this could be pdns.git OR a dnsdist tarball!
 COPY . /source
@@ -24,7 +24,7 @@ ENV MAKEFLAGS ${MAKEFLAGS:--j2}
 
 RUN touch dnsdist.1 # avoid having to install pandoc and venv
 
-RUN autoreconf -vfi
+RUN BUILDER_MODULES=dnsdist autoreconf -vfi
 
 RUN mkdir /build && \
     ./configure \
diff --git a/Dockerfile-recursor b/Dockerfile-recursor
index dde1e1b97c..fe276ef068 100644
--- a/Dockerfile-recursor
+++ b/Dockerfile-recursor
@@ -35,7 +35,7 @@ ENV MAKEFLAGS ${MAKEFLAGS:--j2}
 # Manpage prevent
 RUN touch pdns_recursor.1 rec_control.1 # avoid installing pandoc
 
-RUN autoreconf -vfi
+RUN BUILDER_MODULES=recursor autoreconf -vfi
 
 RUN mkdir /build && \
     ./configure \