浏览代码

update docker org urls in docs and scripts

Nick Sweeting 5 年之前
父节点
当前提交
cc3579f70f
共有 5 个文件被更改,包括 27 次插入24 次删除
  1. 11 11
      README.md
  2. 11 11
      archivebox.egg-info/PKG-INFO
  3. 2 0
      bin/build_docker.sh
  4. 1 0
      bin/release.sh
  5. 2 2
      docker-compose.yml

+ 11 - 11
README.md

@@ -21,7 +21,7 @@
 <a href="https://github.com/ArchiveBox/ArchiveBox"><img src="https://img.shields.io/github/stars/ArchiveBox/ArchiveBox.svg?logo=github&label=Stars&logoColor=blue"/></a>
 <a href="https://test.pypi.org/project/archivebox/"><img src="https://img.shields.io/badge/Python-%3E%3D3.7-yellow.svg?logo=python&logoColor=yellow"/></a>
 <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Install#dependencies"><img src="https://img.shields.io/badge/Chromium-%3E%3D59-orange.svg?logo=Google+Chrome&logoColor=orange"/></a>
-<a href="https://hub.docker.com/r/nikisweeting/archivebox"><img src="https://img.shields.io/badge/Docker-all%20platforms-lightblue.svg?logo=docker&logoColor=lightblue"/></a>
+<a href="https://hub.docker.com/r/archivebox/archivebox"><img src="https://img.shields.io/badge/Docker-all%20platforms-lightblue.svg?logo=docker&logoColor=lightblue"/></a>
 
 <hr/>
 </div>
@@ -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 <command> [args]
+# docker run -v $PWD:/data -it archivebox/archivebox <command> [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
 ```
 

+ 11 - 11
archivebox.egg-info/PKG-INFO

@@ -36,7 +36,7 @@ Description: <div align="center">
         <a href="https://github.com/ArchiveBox/ArchiveBox"><img src="https://img.shields.io/github/stars/ArchiveBox/ArchiveBox.svg?logo=github&label=Stars&logoColor=blue"/></a>
         <a href="https://test.pypi.org/project/archivebox/"><img src="https://img.shields.io/badge/Python-%3E%3D3.7-yellow.svg?logo=python&logoColor=yellow"/></a>
         <a href="https://github.com/ArchiveBox/ArchiveBox/wiki/Install#dependencies"><img src="https://img.shields.io/badge/Chromium-%3E%3D59-orange.svg?logo=Google+Chrome&logoColor=orange"/></a>
-        <a href="https://hub.docker.com/r/nikisweeting/archivebox"><img src="https://img.shields.io/badge/Docker-all%20platforms-lightblue.svg?logo=docker&logoColor=lightblue"/></a>
+        <a href="https://hub.docker.com/r/archivebox/archivebox"><img src="https://img.shields.io/badge/Docker-all%20platforms-lightblue.svg?logo=docker&logoColor=lightblue"/></a>
         
         <hr/>
         </div>
@@ -51,9 +51,9 @@ Description: <div align="center">
         #### 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: <div align="center">
         ## Docker
         
         ```bash
-        # docker run -v $PWD:/data -it nikisweeting/archivebox <command> [args]
+        # docker run -v $PWD:/data -it archivebox/archivebox <command> [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
         ```
         

+ 2 - 0
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

+ 1 - 0
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"

+ 2 - 2
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