Merge pull request #14866 from Habbie/no-rust-sdist-export

rec build: stop using /sdist/ to cache rust
PowerDNS · Nov 22, 2024 · 6f2b1a4 · 6f2b1a4
2 parents 66ce6b4 + 370b39b
commit 6f2b1a4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
@@ -9,7 +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
+COPY --from=pdns-recursor /tmp/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
@@ -24,4 +24,3 @@ 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
@@ -16,7 +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
+COPY --from=pdns-recursor /tmp/rust* /tmp
 RUN cd /pdns/builder-support/helpers/ && ./install_rust.sh
 @ENDIF