Add qdtoday/qd in Dockerhub

qd-today · Jun 1, 2023 · e208928 · e208928
1 parent 82d2c65
commit e208928
Show file tree

Hide file tree

Showing 13 changed files with 170 additions and 112 deletions.
diff --git a/.github/workflows/Build Image.yml b/.github/workflows/Build Image.yml
diff --git a/.github/workflows/Build Ja3 Image.yml b/.github/workflows/Build Ja3 Image.yml
diff --git a/.github/workflows/Build Lite Image.yml b/.github/workflows/Build Lite Image.yml
diff --git a/.github/workflows/DockerHub-Description.yml b/.github/workflows/DockerHub-Description.yml
@@ -13,10 +13,18 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Docker Hub Description
+    - name: Docker a76yyyy Hub Description
       uses: peter-evans/dockerhub-description@v3
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
         repository: a76yyyy/qiandao
+        short-description: ${{ github.event.repository.description }}
+
+    - name: Docker qdtoday Hub Description
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        username: ${{ secrets.QD_DOCKER_USERNAME }}
+        password: ${{ secrets.QD_DOCKER_PASSWORD }}
+        repository: qdtoday/qd
         short-description: ${{ github.event.repository.description }}
diff --git a/.github/workflows/Publish Ja3 Package.yml b/.github/workflows/Publish Ja3 Package.yml
@@ -30,17 +30,58 @@ jobs:
         registry: ghcr.io
         username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
         password: ${{ secrets.GITHUB_TOKEN }} # dockerServer Token
-    - name: Login to DockerHub
+    - name: login to qdtoday DockerHub
       uses: docker/login-action@v2
       with:
         registry: docker.io
-        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
-        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token
+        username: ${{ secrets.QD_DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=QD_DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.QD_DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=QD_DOCKER_PASSWORD  value=dockerToken
     - name: Publish Ja3 Package
       uses: docker/build-push-action@v4
+      if: github.ref == 'refs/heads/master'
       with:
         context: .
         file: ./Dockerfile.ja3
         platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
         push: true
-        tags: ghcr.io/qd-today/qd:ja3-latest,docker.io/a76yyyy/qiandao:ja3-dev
+        tags: ghcr.io/qd-today/qd:ja3-latest,docker.io/qdtoday/qd:ja3-dev
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: github.ref == 'refs/heads/master'
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: github.ref == 'refs/heads/master'
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:ja3-dev \
+          docker.io/qdtoday/qd:ja3-dev
+    - name: Get version
+      id: get_version
+      if: startsWith(github.ref, 'refs/tags/')
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: Build Ja3-latest Package
+      uses: docker/build-push-action@v4
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        context: .
+        file: ./Dockerfile.ja3
+        platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
+        push: true
+        tags: docker.io/qdtoday/qd:ja3-latest,docker.io/qdtoday/qd:ja3-${{ steps.get_version.outputs.VERSION }}
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:ja3-latest \
+          --tag docker.io/a76yyyy/qiandao:ja3-${{ steps.get_version.outputs.VERSION }} \
+          docker.io/qdtoday/qd:ja3-${{ steps.get_version.outputs.VERSION }}
diff --git a/.github/workflows/Publish Lite Package.yml b/.github/workflows/Publish Lite Package.yml
@@ -30,17 +30,58 @@ jobs:
         registry: ghcr.io
         username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
         password: ${{ secrets.GITHUB_TOKEN }} # dockerServer Token
-    - name: Login to DockerHub
+    - name: login to qdtoday DockerHub
       uses: docker/login-action@v2
       with:
         registry: docker.io
-        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
-        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token
+        username: ${{ secrets.QD_DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=QD_DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.QD_DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=QD_DOCKER_PASSWORD  value=dockerToken
     - name: Publish Lite Package
       uses: docker/build-push-action@v4
+      if: github.ref == 'refs/heads/master'
       with:
         context: .
         file: ./Dockerfile.lite
         platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
         push: true
-        tags: ghcr.io/qd-today/qd-lite:latest,docker.io/a76yyyy/qiandao:lite-dev
+        tags: ghcr.io/qd-today/qd:lite-latest,docker.io/qdtoday/qd:lite-dev
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: github.ref == 'refs/heads/master'
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: github.ref == 'refs/heads/master'
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:lite-dev \
+          docker.io/qdtoday/qd:lite-dev
+    - name: Get version
+      id: get_version
+      if: startsWith(github.ref, 'refs/tags/')
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: Build Lite-latest Package
+      uses: docker/build-push-action@v4
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        context: .
+        file: ./Dockerfile.lite
+        platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
+        push: true
+        tags: docker.io/qdtoday/qd:lite-latest,docker.io/qdtoday/qd:lite-${{ steps.get_version.outputs.VERSION }}
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:lite-latest \
+          --tag docker.io/a76yyyy/qiandao:lite-${{ steps.get_version.outputs.VERSION }} \
+          docker.io/qdtoday/qd:lite-${{ steps.get_version.outputs.VERSION }}
diff --git a/.github/workflows/Publish Package.yml b/.github/workflows/Publish Package.yml
@@ -30,17 +30,58 @@ jobs:
         registry: ghcr.io
         username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
         password: ${{ secrets.GITHUB_TOKEN }} # dockerServer Token
-    - name: Login to DockerHub
+    - name: login to qdtoday DockerHub
       uses: docker/login-action@v2
       with:
         registry: docker.io
-        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
-        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token
+        username: ${{ secrets.QD_DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=QD_DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.QD_DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=QD_DOCKER_PASSWORD  value=dockerToken
     - name: Publish Latest Package
       uses: docker/build-push-action@v4
+      if: github.ref == 'refs/heads/master'
       with:
         context: .
         file: ./Dockerfile
         platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
         push: true
-        tags: ghcr.io/qd-today/qd:latest,docker.io/a76yyyy/qiandao:dev
+        tags: ghcr.io/qd-today/qd:latest,docker.io/qdtoday/qd:dev
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: github.ref == 'refs/heads/master'
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: github.ref == 'refs/heads/master'
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:dev \
+          docker.io/qdtoday/qd:dev
+    - name: Get version
+      id: get_version
+      if: startsWith(github.ref, 'refs/tags/')
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+    - name: Build Latest Package
+      uses: docker/build-push-action@v4
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台
+        push: true
+        tags: docker.io/qdtoday/qd:latest,docker.io/qdtoday/qd:${{ steps.get_version.outputs.VERSION }}
+    - name: Login to a76yyyy DockerHub
+      uses: docker/login-action@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_USERNAME }} # dockerServer Username 在setting创建secrets name=DOCKER_USERNAME  value=dockerid
+        password: ${{ secrets.DOCKER_PASSWORD }} # dockerServer Token 在setting创建secrets name=DOCKER_PASSWORD  value=dockerToken
+    - name: Push image to a76yyyy DockerHub
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        docker buildx imagetools create \
+          --tag docker.io/a76yyyy/qiandao:latest \
+          --tag docker.io/a76yyyy/qiandao:${{ steps.get_version.outputs.VERSION }} \
+          docker.io/qdtoday/qd:${{ steps.get_version.outputs.VERSION }}
diff --git a/README.md b/README.md
@@ -38,18 +38,18 @@ QD —— 一个<b>HTTP请求定时任务自动执行框架</b> base on HAR Edit
 [last-commit-url]: https://github.com/qd-today/qd/
 [commit-activity-image]: https://img.shields.io/github/commit-activity/m/qd-today/qd
 [commit-activity-url]: https://github.com/qd-today/qd/
-[docker-version-image]: https://img.shields.io/docker/v/a76yyyy/qiandao?style=flat
-[docker-version-url]: https://hub.docker.com/r/a76yyyy/qiandao/tags?page=1&ordering=last_updated
-[docker-pulls-image]: https://img.shields.io/docker/pulls/a76yyyy/qiandao?style=flat
-[docker-pulls-url]: https://hub.docker.com/r/a76yyyy/qiandao
-[docker-stars-image]: https://img.shields.io/docker/stars/a76yyyy/qiandao?style=flat
-[docker-stars-url]: https://hub.docker.com/r/a76yyyy/qiandao
-[docker-image-size-image]: https://img.shields.io/docker/image-size/a76yyyy/qiandao?style=flat
-[docker-image-size-url]: https://hub.docker.com/r/a76yyyy/qiandao
+[docker-version-image]: https://img.shields.io/docker/v/qdtoday/qd?style=flat
+[docker-version-url]: https://hub.docker.com/r/qdtoday/qd/tags?page=1&ordering=last_updated
+[docker-pulls-image]: https://img.shields.io/docker/pulls/qdtoday/qd?style=flat
+[docker-pulls-url]: https://hub.docker.com/r/qdtoday/qd
+[docker-stars-image]: https://img.shields.io/docker/stars/qdtoday/qd?style=flat
+[docker-stars-url]: https://hub.docker.com/r/qdtoday/qd
+[docker-image-size-image]: https://img.shields.io/docker/image-size/qdtoday/qd?style=flat
+[docker-image-size-url]: https://hub.docker.com/r/qdtoday/qd
 [repo-size-image]: https://img.shields.io/github/repo-size/qd-today/qd
 [python-version-image]: https://img.shields.io/github/pipenv/locked/python-version/qd-today/qd
-[workflow-image]: https://github.com/qd-today/qd/actions/workflows/Build%20Image.yml/badge.svg
-[workflow-url]: https://github.com/qd-today/qd/actions/workflows/Build%20Image.yml
+[workflow-image]: https://github.com/qd-today/qd/actions/workflows/Publish%20Package.yml/badge.svg
+[workflow-url]: https://github.com/qd-today/qd/actions/workflows/Publish%20Package.yml
 
 </div>
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,8 +2,9 @@ version: "3"
 
 services:
   qd:
-    image: a76yyyy/qiandao:latest
-    # image: a76yyyy/qiandao:lite-latest
+    image: qdtoday/qd:latest
+    # image: qdtoday/qd:lite-latest # 精简版
+    # image: qdtoday/qd:dev # 开发版
     container_name: qd
     depends_on:
       - redis

diff --git a/web/docs/guide/deployment.md b/web/docs/guide/deployment.md
@@ -8,7 +8,7 @@ Docker Container Deployment is the easiest way to deploy QD.
 
 ### Container
 
-**DockerHub URL** : [https://hub.docker.com/r/a76yyyy/qiandao](https://hub.docker.com/r/a76yyyy/qiandao)
+**DockerHub URL** : [https://hub.docker.com/r/qdtoday/qd](https://hub.docker.com/r/qdtoday/qd)
 
 ### Deploy Method
 
@@ -27,21 +27,21 @@ docker-compose up -d
 
 > See [Configuration](#configuration-environment-variables) below for configuration description
 >
-> If you don't need `OCR` or `hard disk space is not larger than 600M`, please use **`a76yyyy/qiandao:lite-latest`** image, **this image only removes OCR related functions, other than the mainline version to keep consistent**.
+> If you don't need `OCR` or `hard disk space is not larger than 600M`, please use **`qdtoday/qd:lite-latest`** image, **this image only removes OCR related functions, other than the mainline version to keep consistent**.
 >
 > **Please don't use AliCloud image source to pull Docker container, it will not pull the latest image.**
 
 #### 2. Docker Run
 
 ``` sh
-docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config a76yyyy/qiandao
+docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config qdtoday/qd
 ```
 
 Try this command if you cannot connect to the external network inside the container:
 
 ``` sh
 # Create container using Host network mode, port: 8923
-docker run -d --name qd --env PORT=8923 --net=host -v $(pwd)/qd/config:/usr/src/app/config a76yyyy/qiandao
+docker run -d --name qd --env PORT=8923 --net=host -v $(pwd)/qd/config:/usr/src/app/config qdtoday/qd
 ```
 
 > Please note that after creating a container with this command, please change the api request of `http://localhost/` form in the template to `api://` or `http://localhost:8923/` manually in order to complete the related API request properly.