Skip to content

Commit

Permalink
doc: 说明文档中更改镜像为阿里仓库,解决拉取镜像难的问题 (eryajf#261)
Browse files Browse the repository at this point in the history
  • Loading branch information
eryajf committed Jun 21, 2023
1 parent 60e1c43 commit a7def7f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 24 deletions.
24 changes: 3 additions & 21 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
- name: Build and push to DockerHub
uses: docker/build-push-action@v2
with:
context: .
Expand All @@ -61,33 +61,15 @@ jobs:
${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:${{ env.GITHUB_REF_NAME }}
${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:latest
# 镜像推送到 ghcr
# - name: Login to the GitHub Container Registry
# uses: docker/login-action@v2
# with:
# registry: ghcr.io
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

# - name: Build and push image:latest
# uses: docker/build-push-action@v3
# with:
# context: .
# push: true
# platforms: linux/amd64,linux/arm64
# tags: |
# ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:${{ env.GITHUB_REF_NAME }}
# ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-dingtalk:latest

# 镜像推送到 阿里云仓库
- name: Login to the GitHub Container Registry
- name: Login to the Ali Registry
uses: docker/login-action@v2
with:
registry: registry.cn-hangzhou.aliyuncs.com
username: ${{ secrets.ALIHUB_USERNAME }}
password: ${{ secrets.ALIHUB_TOKEN }}

- name: Build and push image:latest
- name: Build and push to Ali
uses: docker/build-push-action@v3
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ $ docker run -itd --name chatgpt -p 8090:8090 \
-e DINGTALK_CREDENTIALS="your_client_id1:secret1,your_client_id2:secret2" \
-e HELP="欢迎使用本工具\n\n你可以查看:[用户指南](https://github.com/eryajf/chatgpt-dingtalk/blob/main/docs/userGuide.md)\n\n这是一个[开源项目](https://github.com/eryajf/chatgpt-dingtalk/)
,觉得不错你可以来波素质三连." \
--restart=always dockerproxy.com/eryajf/chatgpt-dingtalk:latest
--restart=always registry.cn-hangzhou.aliyuncs.com/ali_eryajf/chatgpt-dingtalk
```

> 运行命令中映射的配置文件参考下边的[配置文件说明](#%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E8%AF%B4%E6%98%8E)
Expand All @@ -216,7 +216,7 @@ $ docker run -itd --name chatgpt -p 8090:8090 \
$ cp config.example.yml config.yml # 其中 config.example.yml 从项目的根目录获取
# 运行项目
$ docker run -itd --name chatgpt -p 8090:8090 -v `pwd`/config.yml:/app/config.yml --restart=always dockerproxy.com/eryajf/chatgpt-dingtalk:latest
$ docker run -itd --name chatgpt -p 8090:8090 -v `pwd`/config.yml:/app/config.yml --restart=always registry.cn-hangzhou.aliyuncs.com/ali_eryajf/chatgpt-dingtalk
```

其中配置文件参考下边的配置文件说明。
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
chatgpt:
container_name: chatgpt
image: eryajf/chatgpt-dingtalk:latest
image: registry.cn-hangzhou.aliyuncs.com/ali_eryajf/chatgpt-dingtalk
restart: always
environment:
LOG_LEVEL: "info" # 应用的日志级别 info/debug
Expand Down

0 comments on commit a7def7f

Please sign in to comment.