diff --git a/Dockerfile b/Dockerfile index cc4c8c7b..9d935955 100644 --- a/Dockerfile +++ b/Dockerfile @@ -209,21 +209,20 @@ RUN echo "[+] Installing NPM extractor dependencies..." \ ######### Build Dependencies #################################### -# # Install ArchiveBox development dependencies -# WORKDIR "$CODE_DIR" -# COPY --chown=root:root --chmod=755 "./pyproject.toml" "./pdm.lock" "$CODE_DIR/" -# RUN echo "[+] Installing project Python dependencies..." \ -# && apt-get update -qq \ -# && apt-get install -qq -y -t bookworm-backports --no-install-recommends \ -# build-essential libssl-dev libldap2-dev libsasl2-dev \ -# && pdm use -f $GLOBAL_VENV \ -# && pdm install --fail-fast --no-lock --group :all --no-self \ -# && pdm build \ -# && apt-get purge -y \ -# build-essential libssl-dev libldap2-dev libsasl2-dev \ -# # these are only needed to build CPython libs, we discard after build phase to shrink layer size -# && apt-get autoremove -y \ -# && rm -rf /var/lib/apt/lists/* +# Install ArchiveBox Python dependencies +WORKDIR "$CODE_DIR" +COPY --chown=root:root --chmod=755 "./pyproject.toml" "./pdm.lock" "$CODE_DIR/" +RUN echo "[+] Installing PIP ArchiveBox dependencies..." \ + && apt-get update -qq \ + && apt-get install -qq -y -t bookworm-backports --no-install-recommends \ + build-essential libssl-dev libldap2-dev libsasl2-dev \ + && pdm use -f $GLOBAL_VENV \ + && pdm install --fail-fast --no-lock --prod --no-self \ + && apt-get purge -y \ + build-essential libssl-dev libldap2-dev libsasl2-dev \ + # these are only needed to build CPython libs, we discard after build phase to shrink layer size + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* # Install ArchiveBox Python package from source COPY --chown=root:root --chmod=755 "." "$CODE_DIR/" diff --git a/pdm.lock b/pdm.lock index daa74436..d2d83727 100644 --- a/pdm.lock +++ b/pdm.lock @@ -3,10 +3,9 @@ [metadata] groups = ["default", "build", "debug", "doc", "ldap", "lint", "sonic", "test"] -cross_platform = true -static_urls = false -lock_version = "4.3" -content_hash = "sha256:ae301f566235b00b28cb62a560f1ff1e30f2e0f3e16b0ddae12e97502214b02c" +strategy = ["cross_platform"] +lock_version = "4.4" +content_hash = "sha256:827692ea8b95a8d0033ad1ae915f475e8b5cc46bafd947499ca892d516125c68" [[package]] name = "alabaster" @@ -2039,15 +2038,6 @@ files = [ {file = "wheel-0.41.2.tar.gz", hash = "sha256:0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985"}, ] -[[package]] -name = "youtube-dl" -version = "2021.12.17" -summary = "YouTube video downloader" -files = [ - {file = "youtube_dl-2021.12.17-py2.py3-none-any.whl", hash = "sha256:f1336d5de68647e0364a47b3c0712578e59ec76f02048ff5c50ef1c69d79cd55"}, - {file = "youtube_dl-2021.12.17.tar.gz", hash = "sha256:bc59e86c5d15d887ac590454511f08ce2c47698d5a82c27bfe27b5d814bbaed2"}, -] - [[package]] name = "yt-dlp" version = "2023.10.13" diff --git a/pyproject.toml b/pyproject.toml index b696600c..acd8571a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,6 @@ build = [ "stdeb", "twine", "wheel", - "regex=2021.9.30; platform_machine == 'armv7l'", ] lint = [ "flake8",