docker: Fix a few too many copies (3ffc238799).

docker: Additional tweaks.

Signed-off-by: Jason Volk <jason@zemos.net>

docker/Dockerfile.cargo.deb

@@ -55,7 +55,7 @@ FROM input AS package-install
 ARG pkg_dir
 
 WORKDIR ${pkg_dir}
-COPY --from=package . .
+COPY --link --from=package . .
 RUN <<EOF
 	set -eux
 	dpkg --info *

docker/Dockerfile.cargo.install

@@ -60,9 +60,6 @@ ARG sys_target
 ARG CARGO_INSTALL_ROOT
 ARG install_temp="/usr/src/tuwunel/install"
 
-WORKDIR /usr/lib/${sys_target}
-COPY --from=rocksdb --exclude=librocksdb.a . .
-
 WORKDIR /
 RUN \
 --mount=type=bind,from=output,src=${install_temp},dst=/mnt/install \

docker/Dockerfile.cargo.rpm

@@ -49,7 +49,7 @@ FROM redhat/ubi9 AS package-install
 ARG pkg_dir
 
 WORKDIR ${pkg_dir}
-COPY --from=package . .
+COPY --link --from=package . .
 RUN <<EOF
 	set -eux
 	rpm -i --test *

docker/Dockerfile.diner

@@ -11,9 +11,6 @@ ARG var_cache
 ARG var_lib_apt
 ARG packages
 
-WORKDIR /
-COPY --link --from=input . .
-
 ENV packages="ca-certificates ${packages}"
 RUN \
 --mount=type=cache,dst=${var_cache},sharing=locked \
@@ -34,9 +31,6 @@ FROM input AS valgrind
 ARG var_cache
 ARG var_lib_apt
 
-WORKDIR /
-COPY --link --from=input . .
-
 RUN \
 --mount=type=cache,dst=${var_cache},sharing=locked \
 --mount=type=cache,dst=${var_lib_apt},sharing=locked \
@@ -50,9 +44,6 @@ FROM input AS perf
 ARG var_cache
 ARG var_lib_apt
 
-WORKDIR /
-COPY --link --from=input . .
-
 RUN \
 --mount=type=cache,dst=${var_cache},sharing=locked \
 --mount=type=cache,dst=${var_lib_apt},sharing=locked \

docker/Dockerfile.ingredients

@@ -3,6 +3,9 @@
 FROM input AS source
 ARG git_checkout
 
+WORKDIR /
+COPY --link --from=input . .
+
 ADD --keep-git-dir . /usr/src/tuwunel
 WORKDIR /usr/src/tuwunel
 RUN <<EOF
@@ -22,9 +25,6 @@ ARG CARGO_HOME
 ARG CARGO_TARGET
 ARG CARGO_TERM_VERBOSE=0
 
-WORKDIR /
-COPY --link --from=input . .
-
 WORKDIR /usr/src/tuwunel
 COPY --link --from=source /usr/src/tuwunel .
 

docker/Dockerfile.rocksdb

@@ -1,6 +1,7 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS rocksdb-fetch
+
 WORKDIR /usr/src
 COPY --link --from=recipe rocksdb.url .
 RUN <<EOF

docker/bake.sh

@@ -105,7 +105,7 @@ if test "$CI_SILENT_BAKE" = "true"; then
 fi
 
 arg="$args -f $BASEDIR/bake.hcl"
-trap 'set +x; date; echo -e "\033[1;41;37mFAIL\033[0m"' ERR
+trap 'set +x; date; echo -e "\033[1;41;37mERROR\033[0m"' ERR
 
 if test "$CI_VERBOSE_ENV" = "true"; then
 	date
@@ -124,4 +124,4 @@ trap '' ERR
 set -ux
 docker buildx bake $arg $bake_target
 set +x
-echo -e "\033[1;42;30mPASS\033[0m"
+echo -e "\033[1;42;30mACCEPT\033[0m"