fix docker release script

bin/build_docker.sh

@@ -73,7 +73,7 @@ check_platforms || (recreate_builder && check_platforms) || exit 1
 
 # Build python package lists
 echo "[+] Generating requirements.txt and pdm.lock from pyproject.toml..."
-pdm lock --group=':all' --strategy="cross_platform" --production
+pdm lock --group=':all' --strategy="inherit_metadata" --production
 pdm export --group=':all' --production --without-hashes -o requirements.txt
 
 
@@ -88,14 +88,17 @@ docker buildx build --platform "$SELECTED_PLATFORMS" --load . \
                -t archivebox/archivebox:$SHORT_VERSION \
                -t archivebox/archivebox:$GIT_SHA \
                -t archivebox/archivebox:latest \
+               -t archivebox/archivebox:stable \
                -t nikisweeting/archivebox \
                -t nikisweeting/archivebox:$TAG_NAME \
                -t nikisweeting/archivebox:$VERSION \
                -t nikisweeting/archivebox:$SHORT_VERSION \
                -t nikisweeting/archivebox:$GIT_SHA \
                -t nikisweeting/archivebox:latest \
+               -t nikisweeting/archivebox:stable \
                -t ghcr.io/archivebox/archivebox/archivebox:$TAG_NAME \
                -t ghcr.io/archivebox/archivebox/archivebox:$VERSION \
                -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \
                -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA \
-               -t ghcr.io/archivebox/archivebox/archivebox:latest
+               -t ghcr.io/archivebox/archivebox/archivebox:latest \
+               -t ghcr.io/archivebox/archivebox/archivebox:stable

bin/release_docker.sh

@@ -26,8 +26,8 @@ SELECTED_PLATFORMS="${2:-$SUPPORTED_PLATFORMS}"
 # docker login --username=nikisweeting
 # docker login ghcr.io --username=pirate
 
-echo "[^] Building docker image"
-./bin/build_docker.sh "$TAG_NAME" "$SELECTED_PLATFORMS"
+# echo "[^] Building docker image"
+# ./bin/build_docker.sh "$TAG_NAME" "$SELECTED_PLATFORMS"
 
 echo "[^] Uploading docker image"
 docker buildx build --platform "$SELECTED_PLATFORMS" --push . \
@@ -37,14 +37,18 @@ docker buildx build --platform "$SELECTED_PLATFORMS" --push . \
                -t archivebox/archivebox:$SHORT_VERSION \
                -t archivebox/archivebox:$GIT_SHA \
                -t archivebox/archivebox:latest \
+               -t archivebox/archivebox:stable \
                -t nikisweeting/archivebox \
                -t nikisweeting/archivebox:$TAG_NAME \
                -t nikisweeting/archivebox:$VERSION \
                -t nikisweeting/archivebox:$SHORT_VERSION \
                -t nikisweeting/archivebox:$GIT_SHA \
                -t nikisweeting/archivebox:latest \
+               -t nikisweeting/archivebox:stable \
                -t ghcr.io/archivebox/archivebox/archivebox:$TAG_NAME \
                -t ghcr.io/archivebox/archivebox/archivebox:$VERSION \
                -t ghcr.io/archivebox/archivebox/archivebox:$SHORT_VERSION \
-               -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA
+               -t ghcr.io/archivebox/archivebox/archivebox:$GIT_SHA \
+               -t ghcr.io/archivebox/archivebox/archivebox:latest \
+               -t ghcr.io/archivebox/archivebox/archivebox:stable
 

docker-compose.yml

@@ -8,12 +8,10 @@
 # Documentation:
 #     https://github.com/ArchiveBox/ArchiveBox/wiki/Docker#docker-compose
 
-version: '3.9'
-
 services:
     archivebox:
         #image: ${DOCKER_IMAGE:-archivebox/archivebox:dev}
-        image: archivebox/archivebox:dev
+        image: archivebox/archivebox:stable
         command: server --quick-init 0.0.0.0:8000
         ports:
             - 8000:8000
@@ -41,7 +39,7 @@ services:
             # ...
             # add further configuration options from archivebox/config.py as needed (to apply them only to this container)
             # or set using `docker compose run archivebox config --set SOME_KEY=someval` (to persist config across all containers)
-        
+
         # For ad-blocking during archiving, uncomment this section and pihole service section below 
         # networks:
         #   - dns
@@ -51,13 +49,10 @@ services:
 
     ######## Optional Addons: tweak examples below as needed for your specific use case ########
 
-    ### Example: To run the Sonic full-text search backend, first download the config file to sonic.cfg
-    #   $ curl -O https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/master/etc/sonic.cfg
-    # After starting, backfill any existing Snapshots into the full-text index:
-    #   $ docker-compose run archivebox update --index-only
+    ### Example: To run the Sonic full-text search backend, uncomment this block and the sonic config above
 
     # sonic:
-    #    image: valeriansaliou/sonic:latest
+    #    image: archivebox/sonic:latest
     #    expose:
     #        - 1491
     #    environment:
@@ -65,8 +60,8 @@ services:
     #    volumes:
     #        - ./sonic.cfg:/etc/sonic.cfg:ro
     #        - ./data/sonic:/var/lib/sonic/store
-    
-    
+
+
     ### Example: To run pihole in order to block ad/tracker requests during archiving,
     # uncomment this block and set up pihole using its admin interface
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "archivebox",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "ArchiveBox: The self-hosted internet archive",
   "author": "Nick Sweeting <archivebox-npm@sweeting.me>",
   "repository": "github:ArchiveBox/ArchiveBox",
@@ -8,6 +8,6 @@
   "dependencies": {
     "@postlight/parser": "^2.2.3",
     "readability-extractor": "github:ArchiveBox/readability-extractor",
-    "single-file-cli": "^1.1.46"
+    "single-file-cli": "^1.1.54"
   }
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "archivebox"
-version = "0.7.2"
+version = "0.7.3"
 description = "Self-hosted internet archiving solution."
 authors = [
     {name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"},

requirements.txt

@@ -1,54 +1,47 @@
 # This file is @generated by PDM.
 # Please do not edit it manually.
 
-asgiref==3.7.2
-asttokens==2.4.1
-brotli==1.1.0; implementation_name == "cpython"
-brotlicffi==1.1.0.0; implementation_name != "cpython"
-certifi==2023.11.17
-cffi==1.16.0; implementation_name != "cpython"
-charset-normalizer==3.3.2
+asgiref==3.8.1
+asttokens==3.0.0
+certifi==2024.12.14
+charset-normalizer==3.4.0
 colorama==0.4.6; sys_platform == "win32"
-croniter==2.0.1
+croniter==5.0.1
 dateparser==1.2.0
 decorator==5.1.1
 django==3.1.14
 django-auth-ldap==4.1.0
 django-extensions==3.1.5
-exceptiongroup==1.2.0; python_version < "3.11"
-executing==2.0.1
-idna==3.6
+exceptiongroup==1.2.2; python_version < "3.11"
+executing==2.1.0
+idna==3.10
 ipython==8.18.1
-jedi==0.19.1
-matplotlib-inline==0.1.6
-mutagen==1.47.0
+jedi==0.19.2
+matplotlib-inline==0.1.7
 mypy-extensions==1.0.0
-parso==0.8.3
+parso==0.8.4
 pexpect==4.9.0; sys_platform != "win32"
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.48
 ptyprocess==0.7.0; sys_platform != "win32"
-pure-eval==0.2.2
-pyasn1==0.5.1
-pyasn1-modules==0.3.0
-pycparser==2.21; implementation_name != "cpython"
-pycryptodomex==3.19.1
-pygments==2.17.2
-python-crontab==3.0.0
-python-dateutil==2.8.2
+pure-eval==0.2.3
+pyasn1==0.6.1
+pyasn1-modules==0.4.1
+pygments==2.18.0
+python-crontab==3.2.0
+python-dateutil==2.9.0.post0
 python-ldap==3.4.4
-pytz==2023.3.post1
-regex==2023.12.25
-requests==2.31.0
-six==1.16.0
+pytz==2024.2
+regex==2024.11.6
+requests==2.32.3
+six==1.17.0
 sonic-client==1.0.0
-sqlparse==0.4.4
+sqlparse==0.5.3
 stack-data==0.6.3
-traitlets==5.14.1
-typing-extensions==4.9.0; python_version < "3.11"
-tzdata==2023.4; platform_system == "Windows"
+traitlets==5.14.3
+typing-extensions==4.12.2; python_version < "3.11"
+tzdata==2024.2; platform_system == "Windows"
 tzlocal==5.2
-urllib3==2.1.0
-w3lib==2.1.2
-wcwidth==0.2.12
-websockets==12.0
-yt-dlp==2023.12.30
+urllib3==2.2.3
+w3lib==2.2.1
+wcwidth==0.2.13
+yt-dlp==2024.12.13