install git and unignore .git so --version works

diff --git a/.dockerignore b/.dockerignore
index 0ce8025a1e9b08729290ce574743cde15d10eef3..bc83bcdb417da412e47395bca44c3f77f3d2c7a6 100644 (file)
--- 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 6204d45637cbec4c3f67bee99ffcbc243ca198e1..4fedfd71b5f3992daa6bafeac98c786758e437a0 100644 (file)
--- 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 88b3d2df05412c4dc534136dec0b6b932416159c..444841e6d09ccef70643df9c13df85cff7bc54eb 100644 (file)
--- 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 dde1e1b97c2f9ea9dc5273c0bba70300df2ec7f2..fe276ef0687fa62e4cedffc23a6c7bc22bea9760 100644 (file)
--- 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 \