From d2c34c95d953a7d1cf1dbd035679fa907008d0a6 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Wed, 29 Jan 2025 17:59:02 +0400 Subject: ci(fedora41): restore the path to `dnf` cache So, images would really use it again! This reduce build time up to 25%! This was accidentally broken by commit 46d89b8524 (ci: update Linux image to Fedora 41, 2024-10-23, v3.31.0-rc3~7^2~2) by misdiagnosing an error. --- .gitlab/ci/docker/fedora41/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci/docker/fedora41/Dockerfile b/.gitlab/ci/docker/fedora41/Dockerfile index dd2aea6..1b00be5 100644 --- a/.gitlab/ci/docker/fedora41/Dockerfile +++ b/.gitlab/ci/docker/fedora41/Dockerfile @@ -20,7 +20,7 @@ LABEL maintainer="Ben Boeckel " RUN --mount=type=bind,source=dnf.conf,target=/etc/dnf/dnf.conf \ --mount=type=bind,source=install_rust.sh,target=/root/install_rust.sh \ --mount=type=bind,source=rust_packages.lst,target=/root/rust_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/cache/libdnf5,target=/var/cache/libdnf5,sharing=private \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ sh /root/install_rust.sh @@ -31,7 +31,7 @@ LABEL maintainer="Ben Boeckel " RUN --mount=type=bind,source=dnf.conf,target=/etc/dnf/dnf.conf \ --mount=type=bind,source=install_rvm.sh,target=/root/install_rvm.sh \ --mount=type=bind,source=rvm_packages.lst,target=/root/rvm_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/cache/libdnf5,target=/var/cache/libdnf5,sharing=private \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ sh /root/install_rvm.sh @@ -43,7 +43,7 @@ LABEL maintainer="Kyle Edwards " RUN --mount=type=bind,source=dnf.conf,target=/etc/dnf/dnf.conf \ --mount=type=bind,source=install_iwyu.sh,target=/root/install_iwyu.sh \ --mount=type=bind,source=iwyu_packages.lst,target=/root/iwyu_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/cache/libdnf5,target=/var/cache/libdnf5,sharing=private \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ sh /root/install_iwyu.sh @@ -57,7 +57,7 @@ ENV RBENV_ROOT=/opt/rbenv RUN --mount=type=bind,source=dnf.conf,target=/etc/dnf/dnf.conf \ --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ + --mount=type=cache,from=dnf-cache,source=/var/cache/libdnf5,target=/var/cache/libdnf5,sharing=private \ --mount=type=cache,target=/var/cache/pip \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ -- cgit v0.12