]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Dockerfile.build: install sccache from distro packages when available 70206/head
authorSun Yuechi <sunyuechi@iscas.ac.cn>
Wed, 15 Jul 2026 03:53:53 +0000 (11:53 +0800)
committerSun Yuechi <sunyuechi@iscas.ac.cn>
Wed, 15 Jul 2026 03:53:53 +0000 (11:53 +0800)
Prefer the distro-packaged sccache (installed via dnf) over downloading a
release tarball with curl. Fall back to the curl download when the package
is absent or on non-dnf distros, so existing behavior is unchanged.

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>
Dockerfile.build

index 2a857d6da7a0d6fb7bade1c41dc5f97500271f60..d3ef7eab700a2e01a0b068a01aeabef0fda2c43f 100644 (file)
@@ -36,7 +36,9 @@ RUN DISTRO=$DISTRO \
     FOR_MAKE_CHECK=${FOR_MAKE_CHECK} \
     bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh
 RUN \
-    if [ $(uname -m) != ppc64le ]; then \
+    if rpm --quiet --query sccache 2>/dev/null || { command -v dnf >/dev/null 2>&1 && dnf install -y sccache 2>/dev/null; }; then \
+    echo "sccache provided by distro packages"; \
+    elif [ $(uname -m) != ppc64le ]; then \
     SCCACHE_ARCH="$(uname -m)"; \
     if [ "$SCCACHE_ARCH" = riscv64 ]; then SCCACHE_ARCH=riscv64gc; fi; \
     SCCACHE_URL="${SCCACHE_REPO}/releases/download/${SCCACHE_VERSION}/sccache-${SCCACHE_VERSION}-${SCCACHE_ARCH}-unknown-linux-musl.tar.gz"; \