studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
docker: Additional tweaks.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-05-28 21:06:33 +00:00
parent 47f7e33a28
commit b59277e5a9
7 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile.cargo.deb
View File

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

3
docker/Dockerfile.cargo.install
View File

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

2
docker/Dockerfile.cargo.rpm
View File

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

9
docker/Dockerfile.diner
View File

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

6
docker/Dockerfile.ingredients
View File

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

1
docker/Dockerfile.rocksdb
View File

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

4
docker/bake.sh
View File

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