diff --git a/Dockerfile b/Dockerfile index 49e1cba1..86f4d78b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,6 @@ ARG TARGETPLATFORM ARG TARGETOS ARG TARGETARCH ARG TARGETVARIANT -ARG ABX_PLUGINS_REF=f576a7c81a17b0e49adf4789ac7f7143ece1282f -ARG ABX_DL_REF=3cddb1bf4d8a37c49f2a70810e0da840acc96c17 ######### Environment Variables ################################# # Global build-time and runtime environment constants + default pkg manager config @@ -350,20 +348,7 @@ RUN --mount=type=bind,source=pyproject.toml,target=/app/pyproject.toml \ && rm -rf /var/lib/apt/lists/* # installs the pip packages that archivebox depends on, defined in pyproject.toml dependencies -# Install unreleased dev abx package revisions used by the ArchiveBox dev branch. -RUN --mount=type=cache,target=/root/.cache/uv,sharing=locked,id=uv-$TARGETARCH$TARGETVARIANT \ - echo "[+] Installing dev abx package revisions..." \ - && uv pip install --reinstall --no-deps \ - "git+https://github.com/ArchiveBox/abx-plugins.git@${ABX_PLUGINS_REF}" \ - "git+https://github.com/ArchiveBox/abx-dl.git@${ABX_DL_REF}" \ - && ( \ - pip show abx-plugins \ - && pip show abx-dl \ - && echo -e '\n\n' \ - ) | tee -a /VERSION.txt - # Install ArchiveBox Python package from the checked-out source. -# Sibling abx-* packages are installed from pinned upstream refs inside the container. 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..." \ diff --git a/pyproject.toml b/pyproject.toml index 3918ef75..7df69807 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,8 +80,8 @@ dependencies = [ ### Binary/Package Management "abxbus>=2.5.4", # EventBus API "abxpkg>=1.10.7", # for: detecting, versioning, and installing binaries via apt/brew/pip/npm - "abx-plugins>=1.10.56", # shared ArchiveBox plugin package with Chrome/Puppeteer dependency wiring - "abx-dl>=1.10.56", # shared ArchiveBox downloader package with blocking install preflight + "abx-plugins>=1.10.58", # shared ArchiveBox plugin package with Chrome/Puppeteer dependency wiring + "abx-dl>=1.10.58", # shared ArchiveBox downloader package with blocking install preflight ### UUID7 backport for Python <3.14 "uuid7>=0.1.0; python_version < '3.14'", # provides the uuid_extensions module on Python 3.13 ]