From 712ad379494738e6b9bdc5b0e7de9d3415a365f3 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Fri, 4 Apr 2025 23:50:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ci(docker):=20=E6=B7=BB=E5=8A=A0=20Docker?= =?UTF-8?q?=20Hub=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=96=B0=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 GitHub Actions工作流中添加了 Docker Hub 描述更新步骤，使用 peter-evans/dockerhub-description 动作将 README.md 文件内容作为描述发布到 Docker Hub。这有助于保持 Docker镜像页面的描述与项目 README 一致，提高文档的可维护性。 --- .github/workflows/docker-image.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 76636d746..b2657a3e5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -60,4 +60,13 @@ jobs: cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max labels: | org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} - org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file + org.opencontainers.image.revision=${{ github.sha }} + + - name: Docker Hub Description + #这里是通过md文件自动生成dockerhub描述的模块，也可以不需要 + uses: peter-evans/dockerhub-description@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + repository: MaiM-with-u/MaiBot + readme-filepath: ./README.md \ No newline at end of file From 2e195808d9882bf41e93f1adcafb75addabcba00 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:06:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e469cf5a..bde382e5f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: - maim_bot core: container_name: maim-bot-core - image: sengokucola/maimbot:latest - # image: infinitycat/maimbot:latest + image: sengokucola/maimbot:main + # image: infinitycat/maimbot:main environment: - TZ=Asia/Shanghai # - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA From 5fab8aada4876525754a0db6eb4d89954a1e7870 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:10:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b2657a3e5..9e37b8a83 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -67,6 +67,6 @@ jobs: uses: peter-evans/dockerhub-description@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} repository: MaiM-with-u/MaiBot readme-filepath: ./README.md \ No newline at end of file From b0d26a9fd9226b61aeef9ae7da587c36e33ad9e2 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:13:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- .github/workflows/docker-image.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9e37b8a83..76636d746 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -60,13 +60,4 @@ jobs: cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max labels: | org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} - org.opencontainers.image.revision=${{ github.sha }} - - - name: Docker Hub Description - #这里是通过md文件自动生成dockerhub描述的模块，也可以不需要 - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - repository: MaiM-with-u/MaiBot - readme-filepath: ./README.md \ No newline at end of file + org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file