diff --git a/.github/workflows/Build Image.yml b/.github/workflows/Build Image.yml deleted file mode 100644 index ce329469959..00000000000 --- a/.github/workflows/Build Image.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build Image -on: push -jobs: - build: - runs-on: ubuntu-latest - name: Build image job - - steps: - - name: Checkout master - uses: actions/checkout@master - - name: Get version - id: get_version - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - - name: Build and publish image - uses: ilteoood/docker_buildx@master - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - with: - publish: true - imageName: a76yyyy/qiandao # dockerid/imageName - platform: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台 - tag: latest,${{ steps.get_version.outputs.VERSION }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} # docker hub userid 在setting创建secrets name=DOCKER_USERNAME value=dockerid - dockerPassword: ${{ secrets.DOCKER_PASSWORD }} # docker hub password,在setting创建secrets name=DOCKER_PASSWORD value=dockerpassword \ No newline at end of file diff --git a/.github/workflows/Build Ja3 Image.yml b/.github/workflows/Build Ja3 Image.yml deleted file mode 100644 index e89b2a599c0..00000000000 --- a/.github/workflows/Build Ja3 Image.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build Ja3 Image -on: push -jobs: - build: - runs-on: ubuntu-latest - name: Build image job - - steps: - - name: Checkout master - uses: actions/checkout@master - - name: Get version - id: get_version - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - - name: Build and publish image - uses: ilteoood/docker_buildx@master - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - with: - publish: true - imageName: a76yyyy/qiandao # dockerid/imageName - platform: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台 - tag: ja3-latest,ja3-${{ steps.get_version.outputs.VERSION }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} # docker hub userid 在setting创建secrets name=DOCKER_USERNAME value=dockerid - dockerPassword: ${{ secrets.DOCKER_PASSWORD }} # docker hub password,在setting创建secrets name=DOCKER_PASSWORD value=dockerpassword - dockerFile: Dockerfile.ja3 \ No newline at end of file diff --git a/.github/workflows/Build Lite Image.yml b/.github/workflows/Build Lite Image.yml deleted file mode 100644 index 8a481a69009..00000000000 --- a/.github/workflows/Build Lite Image.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build Lite Image -on: push -jobs: - build: - runs-on: ubuntu-latest - name: Build image job - - steps: - - name: Checkout master - uses: actions/checkout@master - - name: Get version - id: get_version - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - - name: Build and publish image - uses: ilteoood/docker_buildx@master - if: startsWith(github.ref, 'refs/tags/') && startsWith(github.repository, 'qd-today/qd') - with: - publish: true - imageName: a76yyyy/qiandao # dockerid/imageName - platform: linux/386,linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7 # 你准备构建的镜像平台 - tag: lite-latest,lite-${{ steps.get_version.outputs.VERSION }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} # docker hub userid 在setting创建secrets name=DOCKER_USERNAME value=dockerid - dockerPassword: ${{ secrets.DOCKER_PASSWORD }} # docker hub password,在setting创建secrets name=DOCKER_PASSWORD value=dockerpassword - dockerFile: Dockerfile.lite \ No newline at end of file diff --git a/.github/workflows/DockerHub-Description.yml b/.github/workflows/DockerHub-Description.yml index 9bf8f2f2c97..a087a863a9e 100644 --- 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 }} \ No newline at end of file diff --git a/.github/workflows/Publish Ja3 Package.yml b/.github/workflows/Publish Ja3 Package.yml index bf047d58faf..6f0fc8dde7c 100644 --- 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 \ No newline at end of file + 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 index 699dffdaa68..cb74cb094f0 100644 --- 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 index d99c83a3998..a85293aefd9 100644 --- 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 \ No newline at end of file + 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 index ff618cf7f84..0eee9171d69 100644 --- a/README.md +++ b/README.md @@ -38,18 +38,18 @@ QD —— 一个HTTP请求定时任务自动执行框架 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 diff --git a/docker-compose.yml b/docker-compose.yml index 38e78dcbd87..1cc1387eba0 100644 --- 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 index 3ae3b4dc1d0..ad84a890a29 100644 --- 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. diff --git a/web/docs/guide/faq.md b/web/docs/guide/faq.md index cd4e81ad931..3911294f8e1 100644 --- a/web/docs/guide/faq.md +++ b/web/docs/guide/faq.md @@ -14,13 +14,13 @@ docker cp database.db container_name:/usr/src/app/config/ ## how to configure the email server in Docker? ``` sh -docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --env MAIL_SMTP=$STMP_Server_ --env MAIL_PORT=$Mailbox_server_port --env MAIL_USER=$Username --env MAIL_PASSWORD=$Password --env DOMAIN=$Domain a76yyyy/qiandao +docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --env MAIL_SMTP=$STMP_Server_ --env MAIL_PORT=$Mailbox_server_port --env MAIL_USER=$Username --env MAIL_PASSWORD=$Password --env DOMAIN=$Domain qdtoday/qd ``` ## how to use MySQL in Docker? ``` sh -docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --ENV DB_TYPE=mysql --ENV JAWSDB_MARIA_URL=mysql://$username:$password@$hostname:$port/$database_name?auth_plugin= a76yyyy/qiandao +docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --ENV DB_TYPE=mysql --ENV JAWSDB_MARIA_URL=mysql://$username:$password@$hostname:$port/$database_name?auth_plugin= qdtoday/qd ``` ## how to build a Docker image by myself? diff --git a/web/docs/zh_CN/guide/deployment.md b/web/docs/zh_CN/guide/deployment.md index 66578b4ae66..9506f7d5d56 100644 --- a/web/docs/zh_CN/guide/deployment.md +++ b/web/docs/zh_CN/guide/deployment.md @@ -8,7 +8,7 @@ Docker 容器部署是部署 QD 的最简单方式。 ### 容器 -**DockerHub 网址**：[https://hub.docker.com/r/a76yyyy/qiandao](https://hub.docker.com/r/a76yyyy/qiandao) +**DockerHub 网址**：[https://hub.docker.com/r/qdtoday/qd](https://hub.docker.com/r/qdtoday/qd) ### 部署方法 @@ -27,21 +27,21 @@ docker-compose up -d > 配置描述见下文 [Configuration](#配置环境变量) > -> 如不需要`OCR功能`或者`硬盘空间不大于600M`, 请使用 **`a76yyyy/qiandao:lite-latest`** 镜像, **该镜像仅去除了OCR相关功能, 其他与主线版本保持一致**。 +> 如不需要`OCR功能`或者`硬盘空间不大于600M`, 请使用 **`qdtoday/qd:lite-latest`** 镜像, **该镜像仅去除了OCR相关功能, 其他与主线版本保持一致**。 > > **请勿使用 阿里云镜像源 拉取 Docker 容器, 会导致无法拉取最新镜像** #### 2. Docker 运行 ``` 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 ``` 容器内部无法连通外部网络时尝试该命令: ``` sh # 使用 Host 网络模式创建容器, 端口号: 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 ``` > 注意: 使用该命令创建容器后, 请将模板里 `http://localhost/` 形式的 api 请求, 手动改成 `api://` 或 `http://localhost:8923/` 后, 才能正常完成相关API请求。 diff --git a/web/docs/zh_CN/guide/faq.md b/web/docs/zh_CN/guide/faq.md index 646d21e3237..53759988c45 100644 --- a/web/docs/zh_CN/guide/faq.md +++ b/web/docs/zh_CN/guide/faq.md @@ -14,13 +14,13 @@ docker cp database.db container_name:/usr/src/app/config/ ## 如何在 Docker 中配置邮箱服务器? ``` sh -docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --env MAIL_SMTP=STMP服务器 --env MAIL_PORT=邮箱服务器端口 --env MAIL_USER=用户名 --env MAIL_PASSWORD=密码 --env DOMAIN=域名 a76yyyy/qiandao +docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --env MAIL_SMTP=STMP服务器 --env MAIL_PORT=邮箱服务器端口 --env MAIL_USER=用户名 --env MAIL_PASSWORD=密码 --env DOMAIN=域名 qdtoday/qd ``` ## 如何在 Docker 中使用 MySQL? ``` sh -docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --ENV DB_TYPE=mysql --ENV JAWSDB_MARIA_URL=mysql://用户名:密码@hostname:port/数据库名 a76yyyy/qiandao +docker run -d --name qd -p 8923:80 -v $(pwd)/qd/config:/usr/src/app/config --ENV DB_TYPE=mysql --ENV JAWSDB_MARIA_URL=mysql://用户名:密码@hostname:port/数据库名 qdtoday/qd ``` ## 如何自己搭建 Docker 镜像?