From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 19 Dec 2017 15:51:34 +0000 (+0100)
Subject: builder: recursor sdist
X-Git-Tag: dnsdist-1.3.3~83^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5b92462f5f11ea39ac7ea0312c6c3bab095ff7;p=thirdparty%2Fpdns.git

builder: recursor sdist
---

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
new file mode 100644
index 0000000000..0e8a3f5c61
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -0,0 +1,19 @@
+FROM alpine:3.6 as pdns-recursor
+
+RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
+                       libtool file boost-dev curl openssl-dev ragel py-virtualenv \
+                       flex bison git
+
+@EXEC sdist_dirs=(build-aux m4 pdns ext docs)
+@EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-recursor/$d/" ; done
+ADD builder/helpers/set-configure-ac-version.sh /pdns-recursor/builder/helpers/
+WORKDIR /pdns-recursor/pdns/recursordist
+
+RUN mkdir /sdist
+
+ARG BUILDER_VERSION
+RUN /pdns-recursor/builder/helpers/set-configure-ac-version.sh && \
+     autoreconf -v -i --force && \
+    ./configure --without-modules --without-dynmodules --disable-dependency-tracking && \
+    make dist
+RUN cp pdns-recursor-${BUILDER_VERSION}.tar.bz2 /sdist/
diff --git a/builder-support/dockerfiles/Dockerfile.target.sdist b/builder-support/dockerfiles/Dockerfile.target.sdist
index 5c1c160e2d..28bb3d468d 100644
--- a/builder-support/dockerfiles/Dockerfile.target.sdist
+++ b/builder-support/dockerfiles/Dockerfile.target.sdist
@@ -17,7 +17,7 @@ COPY --from=pdns-authoritative /sdist/ /sdist/
 @ENDIF
 
 @IF [ ! -z "$M_recursor" ]
-COPY --from=recursor /sdist/ /sdist/
+COPY --from=pdns-recursor /sdist/ /sdist/
 @ENDIF
 
 @IF [ ! -z "$M_dnsdist" ]
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 09901dde98..06e402a202 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -42,9 +42,6 @@ AM_CPPFLAGS +=$(LUA_CFLAGS)
 endif
 
 EXTRA_DIST = \
-	NOTICE \
-	.version \
-	build-aux/gen-version \
 	contrib/* \
 	devpollmplexer.cc \
 	dnslabeltext.cc \
diff --git a/pdns/recursordist/build-aux/gen-version b/pdns/recursordist/build-aux/gen-version
index 65e37dfd1d..68c709be98 120000
--- a/pdns/recursordist/build-aux/gen-version
+++ b/pdns/recursordist/build-aux/gen-version
@@ -1 +1 @@
-../../../build-aux/gen-version
\ No newline at end of file
+../../../builder-support/gen-version
\ No newline at end of file