Merge branch 'main' into dev

This commit is contained in:
Nick Sweeting 2024-01-16 18:15:21 -08:00
commit 131c9f5d83

View file

@ -26,24 +26,24 @@ if (which docker-compose > /dev/null && docker pull archivebox/archivebox:latest
if [ -f "./index.sqlite3" ]; then if [ -f "./index.sqlite3" ]; then
mv ~/archivebox/* ~/archivebox/data/ mv ~/archivebox/* ~/archivebox/data/
fi fi
curl -O 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/master/docker-compose.yml' curl -O 'https://raw.githubusercontent.com/ArchiveBox/ArchiveBox/main/docker-compose.yml'
docker-compose run --rm archivebox init --setup docker compose run --rm archivebox init --setup
echo echo
echo "[+] Starting ArchiveBox server using: docker-compose up -d..." echo "[+] Starting ArchiveBox server using: docker compose up -d..."
docker-compose up -d docker compose up -d
sleep 7 sleep 7
open http://127.0.0.1:8000 || true open http://127.0.0.1:8000 || true
echo echo
echo "[√] Server started on http://0.0.0.0:8000 and data directory initialized in ~/archivebox/data. Usage:" echo "[√] Server started on http://0.0.0.0:8000 and data directory initialized in ~/archivebox/data. Usage:"
echo " cd ~/archivebox" echo " cd ~/archivebox"
echo " docker-compose ps" echo " docker compose ps"
echo " docker-compose down" echo " docker compose down"
echo " docker-compose pull" echo " docker compose pull"
echo " docker-compose up" echo " docker compose up"
echo " docker-compose run archivebox manage createsuperuser" echo " docker compose run archivebox manage createsuperuser"
echo " docker-compose run archivebox add 'https://example.com'" echo " docker compose run archivebox add 'https://example.com'"
echo " docker-compose run archivebox list" echo " docker compose run archivebox list"
echo " docker-compose run archivebox help" echo " docker compose run archivebox help"
exit 0 exit 0
elif (which docker > /dev/null && docker pull archivebox/archivebox:latest); then elif (which docker > /dev/null && docker pull archivebox/archivebox:latest); then
echo "[+] Initializing an ArchiveBox data folder at ~/archivebox using Docker..." echo "[+] Initializing an ArchiveBox data folder at ~/archivebox using Docker..."
@ -189,12 +189,12 @@ which open > /dev/null && open http://127.0.0.1:8000 || true
echo echo
echo "[√] Server started on http://0.0.0.0:8000 and data directory initialized in ~/archivebox. Usage:" echo "[√] Server started on http://0.0.0.0:8000 and data directory initialized in ~/archivebox. Usage:"
echo " cd ~/archivebox" echo " cd ~/archivebox # see your data dir"
echo " ps aux | grep archivebox" echo " ps aux | grep archivebox # see server process pid"
echo " pkill -f archivebox" echo " pkill -f archivebox # stop the server"
echo " python3 -m pip install --upgrade archivebox" echo " archivebox server --quick-init 0.0.0.0:8000 # start server process"
echo " archivebox server --quick-init 0.0.0.0:8000" echo " pip install --upgrade archivebox; archivebox init # update versions"
echo " archivebox manage createsuperuser" echo " archivebox manage createsuperuser # add an admin user+pass"
echo " archivebox add 'https://example.com'" echo " archivebox add 'https://example.com'" # archive a new URL
echo " archivebox list" echo " archivebox list # see URLs archived"
echo " archivebox help" echo " archivebox help # see more help & examples"