From ee3dd69058597eb720b85f6010cb2e53354ad3d0 Mon Sep 17 00:00:00 2001
From: Nicholas Dille <nicholas.dille@mailbox.org>
Date: Mon, 1 Jan 2024 20:55:50 +0100
Subject: [PATCH] Fixed builds #2213

---
 tools/httpie/Dockerfile.template |  4 ++--
 tools/huber/Dockerfile.template  | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/tools/httpie/Dockerfile.template b/tools/httpie/Dockerfile.template
index e7b7e65143..fd0a84470d 100644
--- a/tools/httpie/Dockerfile.template
+++ b/tools/httpie/Dockerfile.template
@@ -8,8 +8,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
-COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
diff --git a/tools/huber/Dockerfile.template b/tools/huber/Dockerfile.template
index 13553d8e7d..02faa2364c 100644
--- a/tools/huber/Dockerfile.template
+++ b/tools/huber/Dockerfile.template
@@ -7,27 +7,22 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-COPY --from=rust / /
+COPY --from=rust / /usr/local/
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
-    build-essential
-EOF
-WORKDIR /tmp/github.com/innobead/huber
-ARG name
-ARG version
-RUN <<EOF
-apt-get update
-apt-get -y install --no-install-recommends \
+    build-essential \
     libarchive13 \
     libarchive-dev \
     libssl-dev \
     pkg-config
 EOF
+WORKDIR /tmp/github.com/innobead/huber
 RUN <<EOF
-source "/etc/profile.d/cargo.sh"
 git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/innobead/huber .
+export CARGO_HOME=/usr/local/cargo
+export RUSTUP_HOME=/usr/local/rustup
 export RUSTFLAGS='-C target-feature=+crt-static'
 cargo build --target x86_64-unknown-linux-gnu --release --workspace --exclude=huber-generator
 cp target/x86_64-unknown-linux-gnu/release/huber "${prefix}/bin/"