diff --git a/archivebox/tests/test_setup_script.py b/archivebox/tests/test_setup_script.py index 9facdff9..438a9f8e 100644 --- a/archivebox/tests/test_setup_script.py +++ b/archivebox/tests/test_setup_script.py @@ -59,7 +59,7 @@ def test_setup_script_prints_root_safe_runtime_commands(): assert 'echo " cd $ARCHIVEBOX_DATA_DIR' in script assert 'FOLLOWUP_SUDO="sudo "' in script - assert "${FOLLOWUP_SUDO}docker compose run --rm archivebox add" in script + assert "${FOLLOWUP_SUDO}docker compose exec archivebox archivebox add" in script assert "${FOLLOWUP_SUDO}archivebox add" in script assert "at ~/archivebox/data" not in script assert "Server started on http://0.0.0.0" not in script diff --git a/bin/setup.sh b/bin/setup.sh index 6accdddc..c9ed9244 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -380,10 +380,10 @@ if [ "$DOCKER_IMAGE_READY" = "true" ] && "$DOCKER_BINARY" compose version > /dev echo " ${FOLLOWUP_SUDO}docker compose down" echo " ${FOLLOWUP_SUDO}env ARCHIVEBOX_IMAGE=$ARCHIVEBOX_IMAGE docker compose pull" echo " ${FOLLOWUP_SUDO}docker compose up" - echo " ${FOLLOWUP_SUDO}docker compose run --rm archivebox manage createsuperuser" - echo " ${FOLLOWUP_SUDO}docker compose run --rm archivebox add 'https://example.com'" - echo " ${FOLLOWUP_SUDO}docker compose run --rm archivebox list" - echo " ${FOLLOWUP_SUDO}docker compose run --rm archivebox help" + echo " ${FOLLOWUP_SUDO}docker compose exec archivebox archivebox manage createsuperuser" + echo " ${FOLLOWUP_SUDO}docker compose exec archivebox archivebox add 'https://example.com'" + echo " ${FOLLOWUP_SUDO}docker compose exec archivebox archivebox list" + echo " ${FOLLOWUP_SUDO}docker compose exec archivebox archivebox help" exit 0 elif [ "$DOCKER_IMAGE_READY" = "true" ]; then resolve_setup_curl