From 2be61de70f8f40650b0591b085106237b4fd66be Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 30 May 2025 22:44:05 +0000
Subject: [PATCH] docker: Reduce more copies.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.cargo.install | 2 ++
 docker/Dockerfile.ingredients   | 8 +++++++-
 docker/Dockerfile.kitchen       | 6 +++---
 docker/bake.hcl                 | 1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.cargo.install b/docker/Dockerfile.cargo.install
index 6af980e4..bf707347 100644
--- a/docker/Dockerfile.cargo.install
+++ b/docker/Dockerfile.cargo.install
@@ -61,6 +61,8 @@ ARG CARGO_INSTALL_ROOT
 ARG install_temp="/usr/src/tuwunel/install"
 
 WORKDIR /
+COPY --link --from=input . .
+
 RUN \
 --mount=type=bind,from=output,src=${install_temp},dst=/mnt/install \
 <<EOF
diff --git a/docker/Dockerfile.ingredients b/docker/Dockerfile.ingredients
index b23fc780..f0a288a9 100644
--- a/docker/Dockerfile.ingredients
+++ b/docker/Dockerfile.ingredients
@@ -6,7 +6,7 @@ ARG git_checkout
 WORKDIR /
 COPY --link --from=input . .
 
-ADD --keep-git-dir . /usr/src/tuwunel
+ADD --link --keep-git-dir . /usr/src/tuwunel
 WORKDIR /usr/src/tuwunel
 RUN <<EOF
     set -eux
@@ -29,6 +29,9 @@ ARG JEMALLOC_OVERRIDE
 #ARG ZSTD_SYS_USE_PKG_CONFIG=0
 #ARG ROCKSDB_LIB_DIR
 
+WORKDIR /
+COPY --link --from=input . .
+
 WORKDIR /usr/src/tuwunel
 COPY --link --from=source /usr/src/tuwunel .
 
@@ -62,6 +65,9 @@ ARG RUSTUP_HOME
 ARG CARGO_HOME
 ARG CARGO_TARGET
 
+WORKDIR /
+COPY --link --from=input . .
+
 WORKDIR /usr/src/tuwunel
 RUN \
 --mount=type=cache,dst=${RUSTUP_HOME},sharing=locked \
diff --git a/docker/Dockerfile.kitchen b/docker/Dockerfile.kitchen
index d343233f..65945f0a 100644
--- a/docker/Dockerfile.kitchen
+++ b/docker/Dockerfile.kitchen
@@ -5,6 +5,9 @@ ARG var_cache
 ARG var_lib_apt
 ARG packages
 
+WORKDIR /
+COPY --link --from=input . .
+
 ENV packages="\
 bzip2 \
 ca-certificates \
@@ -21,9 +24,6 @@ xz-utils \
 ${packages} \
 "
 
-WORKDIR /
-COPY --link --from=input . .
-
 RUN  \
 --mount=type=cache,dst=${var_cache},sharing=locked \
 --mount=type=cache,dst=${var_lib_apt},sharing=locked \
diff --git a/docker/bake.hcl b/docker/bake.hcl
index 46393065..0343254d 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -283,6 +283,7 @@ target "tuwunel" {
     target = "tuwunel"
     dockerfile-inline =<<EOF
         FROM input AS tuwunel
+        COPY --link --from=input . .
         EXPOSE 8008 8448
         ENTRYPOINT ["${cargo_install_root}/bin/tuwunel"]
 EOF