Make rust tarball downloaed in sdist stage available in build stage

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
index caf1847a4aa74aaa649b727e10a86eebbfdd7e45..19b97f727906594a3ec8c7f1437c33ebb07eae10 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.debbuild-prepare
+++ b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
@@ -9,6 +9,7 @@ ADD builder/helpers/ /pdns/builder/helpers/
 ADD builder-support/helpers/ /pdns/builder-support/helpers/
 
 @IF [ -n "$M_recursor$M_all" ]
+COPY --from=sdist /sdist/rust* /tmp
 RUN cd /pdns/builder-support/helpers/ && ./install_rust.sh
 @ENDIF
 

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index 6a2a3f0143dc64f9606825717f28f9911aa1b7dc..edb37f2d7de290abfa7a3eb193a639c1cb75415e 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -24,3 +24,4 @@ RUN /pdns-recursor/builder/helpers/set-configure-ac-version.sh && \
     ./configure --disable-dependency-tracking && \
     make dist
 RUN cp pdns-recursor-${BUILDER_VERSION}.tar.bz2 /sdist/
+RUN cp /tmp/rust* /sdist/

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index e14a416a1439466926a921a1f6cb586ab0a5568f..5bb28646e173c7d19fc6c1eb889176943fb83824 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -16,6 +16,7 @@ ADD builder/helpers/ /pdns/builder/helpers/
 ADD builder-support/helpers/ /pdns/builder-support/helpers/
 
 @IF [ -n "$M_recursor$M_all" ]
+COPY --from=sdist /sdist/rust* /tmp
 RUN cd /pdns/builder-support/helpers/ && ./install_rust.sh
 @ENDIF