From ae73d6747fac50f4d39b65ae92fdf53538188e14 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Fri, 22 Dec 2023 12:06:30 +0100
Subject: [PATCH] Fixes after update of rust

---
 tools/envsub/Dockerfile.template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/envsub/Dockerfile.template b/tools/envsub/Dockerfile.template
index d06f926194..9185f4a46a 100644
--- a/tools/envsub/Dockerfile.template
+++ b/tools/envsub/Dockerfile.template
@@ -7,7 +7,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=rust / /usr/local/
+COPY --link --from=rust / /usr/local/
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 apt-get update
@@ -18,8 +18,9 @@ WORKDIR /tmp/github.com/stephenc/envsub
 ARG name
 ARG version
 RUN <<EOF
-source "/usr/local/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/stephenc/envsub .
+export CARGO_HOME=/usr/local/cargo
+export RUSTUP_HOME=/usr/local/rustup
 cargo build --release --target x86_64-unknown-linux-gnu
 cp target/x86_64-unknown-linux-gnu/release/envsub "${prefix}${target}/bin/"
 EOF
\ No newline at end of file