From 958db6aa233b598aaedd9a179e825ecae24da9f7 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 7 Oct 2024 11:06:48 +0200 Subject: [PATCH] Make rust tarball downloaed in sdist stage available in build stage --- builder-support/dockerfiles/Dockerfile.debbuild-prepare | 1 + builder-support/dockerfiles/Dockerfile.recursor | 1 + builder-support/dockerfiles/Dockerfile.rpmbuild | 1 + 3 files changed, 3 insertions(+) diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare index caf1847a4a..19b97f7279 100644 --- 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 6a2a3f0143..edb37f2d7d 100644 --- 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 e14a416a14..5bb28646e1 100644 --- 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 -- 2.47.2