diff --git a/README.md b/README.md index 230a25e9..6e590e07 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - +
@@ -36,9 +36,9 @@ The main index is a self-contained `data/index.sqlite3` file, and each snapshot #### Quickstart ```bash -docker run -d -it -v ~/archivebox:/data -p 8000:8000 nikisweeting/archivebox server --init 0.0.0.0:8000 -docker run -v ~/archivebox:/data -it nikisweeting/archivebox manage createsuperuser -docker run -v ~/archivebox:/data -it nikisweeting/archivebox add 'https://example.com' +docker run -d -it -v ~/archivebox:/data -p 8000:8000 archivebox/archivebox server --init 0.0.0.0:8000 +docker run -v ~/archivebox:/data -it archivebox/archivebox manage createsuperuser +docker run -v ~/archivebox:/data -it archivebox/archivebox add 'https://example.com' open http://127.0.0.1:8000/admin/login/ # then click "Add" in the navbar ``` @@ -207,20 +207,20 @@ open http://127.0.0.1:8000 ## Docker ```bash -# docker run -v $PWD:/data -it nikisweeting/archivebox [args] +# docker run -v $PWD:/data -it archivebox/archivebox [args] mkdir archivebox && cd archivebox -docker run -v $PWD:/data -it nikisweeting/archivebox init -docker run -v $PWD:/data -it nikisweeting/archivebox add 'https://example.com' -docker run -v $PWD:/data -it nikisweeting/archivebox manage createsuperuser +docker run -v $PWD:/data -it archivebox/archivebox init +docker run -v $PWD:/data -it archivebox/archivebox add 'https://example.com' +docker run -v $PWD:/data -it archivebox/archivebox manage createsuperuser # run the webserver to access the web UI -docker run -v $PWD:/data -it -p 8000:8000 nikisweeting/archivebox server 0.0.0.0:8000 +docker run -v $PWD:/data -it -p 8000:8000 archivebox/archivebox server 0.0.0.0:8000 open http://127.0.0.1:8000 # or export a static version of the index if you dont want to run a server -docker run -v $PWD:/data -it nikisweeting/archivebox list --html --with-headers > index.html -docker run -v $PWD:/data -it nikisweeting/archivebox list --json --with-headers > index.json +docker run -v $PWD:/data -it archivebox/archivebox list --html --with-headers > index.html +docker run -v $PWD:/data -it archivebox/archivebox list --json --with-headers > index.json open ./index.html ``` diff --git a/archivebox.egg-info/PKG-INFO b/archivebox.egg-info/PKG-INFO index c114eea4..eb80f48d 100644 --- a/archivebox.egg-info/PKG-INFO +++ b/archivebox.egg-info/PKG-INFO @@ -36,7 +36,7 @@ Description:
- +
@@ -51,9 +51,9 @@ Description:
#### Quickstart ```bash - docker run -d -it -v ~/archivebox:/data -p 8000:8000 nikisweeting/archivebox server --init 0.0.0.0:8000 - docker run -v ~/archivebox:/data -it nikisweeting/archivebox manage createsuperuser - docker run -v ~/archivebox:/data -it nikisweeting/archivebox add 'https://example.com' + docker run -d -it -v ~/archivebox:/data -p 8000:8000 archivebox/archivebox server --init 0.0.0.0:8000 + docker run -v ~/archivebox:/data -it archivebox/archivebox manage createsuperuser + docker run -v ~/archivebox:/data -it archivebox/archivebox add 'https://example.com' open http://127.0.0.1:8000/admin/login/ # then click "Add" in the navbar ``` @@ -222,20 +222,20 @@ Description:
## Docker ```bash - # docker run -v $PWD:/data -it nikisweeting/archivebox [args] + # docker run -v $PWD:/data -it archivebox/archivebox [args] mkdir archivebox && cd archivebox - docker run -v $PWD:/data -it nikisweeting/archivebox init - docker run -v $PWD:/data -it nikisweeting/archivebox add 'https://example.com' - docker run -v $PWD:/data -it nikisweeting/archivebox manage createsuperuser + docker run -v $PWD:/data -it archivebox/archivebox init + docker run -v $PWD:/data -it archivebox/archivebox add 'https://example.com' + docker run -v $PWD:/data -it archivebox/archivebox manage createsuperuser # run the webserver to access the web UI - docker run -v $PWD:/data -it -p 8000:8000 nikisweeting/archivebox server 0.0.0.0:8000 + docker run -v $PWD:/data -it -p 8000:8000 archivebox/archivebox server 0.0.0.0:8000 open http://127.0.0.1:8000 # or export a static version of the index if you dont want to run a server - docker run -v $PWD:/data -it nikisweeting/archivebox list --html --with-headers > index.html - docker run -v $PWD:/data -it nikisweeting/archivebox list --json --with-headers > index.json + docker run -v $PWD:/data -it archivebox/archivebox list --html --with-headers > index.html + docker run -v $PWD:/data -it archivebox/archivebox list --json --with-headers > index.json open ./index.html ``` diff --git a/bin/build_docker.sh b/bin/build_docker.sh index 8e4394c8..025fe350 100755 --- a/bin/build_docker.sh +++ b/bin/build_docker.sh @@ -21,5 +21,7 @@ docker build . -t archivebox \ -t archivebox:$VERSION \ -t docker.io/nikisweeting/archivebox:latest \ -t docker.io/nikisweeting/archivebox:$VERSION \ + -t docker.io/archivebox/archivebox:latest \ + -t docker.io/archivebox/archivebox:$VERSION \ -t docker.pkg.github.com/pirate/archivebox/archivebox:latest \ -t docker.pkg.github.com/pirate/archivebox/archivebox:$VERSION diff --git a/bin/release.sh b/bin/release.sh index 10d51424..f01eb1d3 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -68,6 +68,7 @@ echo "[^] Uploading docker image" # docker login --username=nikisweeting # docker login docker.pkg.github.com --username=pirate docker push docker.io/nikisweeting/archivebox +docker push docker.io/archivebox/archivebox docker push docker.pkg.github.com/pirate/archivebox/archivebox echo "[√] Done. Published version v$NEW_VERSION" diff --git a/docker-compose.yml b/docker-compose.yml index 4eb45384..5fe91026 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ version: '3.7' services: archivebox: # build: . - image: ${DOCKER_IMAGE:-nikisweeting/archivebox:latest} + image: ${DOCKER_IMAGE:-archivebox/archivebox:latest} command: server 0.0.0.0:8000 stdin_open: true tty: true @@ -30,7 +30,7 @@ services: # Example: Run scheduled imports in a docker instead of using cron on the # host machine, add tasks and see more info with archivebox schedule --help # scheduler: - # image: nikisweeting/archivebox:latest + # image: archivebox/archivebox:latest # command: schedule --foreground --every=day --depth=1 'https://getpocket.com/users/USERNAME/feed/all' # environment: # - USE_COLOR=True