From 97d82c261544c6163f6074c9957348a23bbb854b Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 28 Jul 2026 21:27:52 -0700 Subject: [PATCH] Use uv no-cache in Docker build --- Dockerfile | 12 +++++------- etc/package.json | 2 +- pyproject.toml | 4 ++-- uv.lock | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index d6b4a879..19484a70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,7 +93,6 @@ FROM archivebox-runtime-base AS archivebox-builder WORKDIR "$CODE_DIR" RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-$TARGETARCH$TARGETVARIANT \ - --mount=type=cache,target=/root/.cache/uv,sharing=locked,id=uv-$TARGETARCH$TARGETVARIANT \ --mount=type=bind,source=pyproject.toml,target=/app/pyproject.toml \ <<'EOF' echo "[+] UV Installing ArchiveBox dependencies from pyproject.toml..." @@ -104,8 +103,8 @@ rm -f /etc/apt/apt.conf.d/docker-clean apt-get update -qq apt-get install -qq -y --no-install-recommends \ build-essential gcc libldap2-dev libsasl2-dev libssl-dev -/usr/bin/uv venv --clear /venv --python "${PYTHON_VERSION}" -/usr/bin/uv pip install setuptools pip wheel +/usr/bin/uv venv --no-cache --clear /venv --python "${PYTHON_VERSION}" +/usr/bin/uv pip install --no-cache setuptools pip wheel mkdir -p /tmp/archivebox-uv-project /venv/bin/python - <<'PY' @@ -149,7 +148,7 @@ PY /usr/bin/uv sync \ --project /tmp/archivebox-uv-project \ - --refresh \ + --no-cache \ --no-dev \ --inexact \ --no-install-project \ @@ -172,8 +171,7 @@ rm -rf /var/lib/apt/lists/* EOF COPY --chown=root:root --chmod=755 "." "$CODE_DIR/" -RUN --mount=type=cache,target=/root/.cache/uv,sharing=locked,id=uv-$TARGETARCH$TARGETVARIANT \ - echo "[*] Installing ArchiveBox Python source code from $CODE_DIR..." \ +RUN echo "[*] Installing ArchiveBox Python source code from $CODE_DIR..." \ && COMMIT_HASH="$( \ if [[ "$ARCHIVEBOX_COMMIT_HASH" =~ ^[0-9a-fA-F]{40}$ ]]; then \ echo "$ARCHIVEBOX_COMMIT_HASH"; \ @@ -187,7 +185,7 @@ RUN --mount=type=cache,target=/root/.cache/uv,sharing=locked,id=uv-$TARGETARCH$T fi; \ fi)" \ && if [[ "$COMMIT_HASH" =~ ^[0-9a-fA-F]{40}$ ]]; then echo "COMMIT_HASH=$COMMIT_HASH" | tee -a /VERSION.txt; fi \ - && /usr/bin/uv pip install --no-deps "$CODE_DIR" \ + && /usr/bin/uv pip install --no-cache --no-deps "$CODE_DIR" \ && rm -f /venv/bin/uv /venv/bin/uvx \ && /usr/bin/uv pip show archivebox | tee -a /VERSION.txt diff --git a/etc/package.json b/etc/package.json index 19c2d157..19bf6092 100644 --- a/etc/package.json +++ b/etc/package.json @@ -1,6 +1,6 @@ { "name": "archivebox", - "version": "0.9.35rc168", + "version": "0.9.35rc169", "repository": "github:ArchiveBox/ArchiveBox", "license": "MIT", "dependencies": { diff --git a/pyproject.toml b/pyproject.toml index 26033cd1..ef3339ff 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "archivebox" -version = "0.9.35rc168" +version = "0.9.35rc169" requires-python = ">=3.13" description = "Self-hosted internet archiving solution." authors = [{name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}] @@ -348,7 +348,7 @@ Donate = "https://github.com/ArchiveBox/ArchiveBox/wiki/Donations" [tool.bumpver] -current_version = "v0.9.35rc168" +current_version = "v0.9.35rc169" version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]" commit_message = "bump version {old_version} -> {new_version}" tag_message = "{new_version}" diff --git a/uv.lock b/uv.lock index 6ae12c9c..ff72abf3 100644 --- a/uv.lock +++ b/uv.lock @@ -123,7 +123,7 @@ wheels = [ [[package]] name = "archivebox" -version = "0.9.35rc168" +version = "0.9.35rc169" source = { editable = "." } dependencies = [ { name = "abx-dl" },