From 370b39b4ca308f26ed1bbaa0eaa186320d6c8084 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 22 Nov 2024 14:17:21 +0100 Subject: [PATCH] rec build: stop using /sdist/ to cache rust --- builder-support/dockerfiles/Dockerfile.debbuild-prepare | 2 +- builder-support/dockerfiles/Dockerfile.recursor | 1 - builder-support/dockerfiles/Dockerfile.rpmbuild | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare index 19b97f727906..45baa8998741 100644 --- 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 index edb37f2d7de2..6a2a3f0143dc 100644 --- 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 index f78512b20bfb..1101a56df35b 100644 --- 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