From 23d03ef33bf294f21108b19c1f6803b9f7386f31 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Apr 2025 12:59:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E7=94=A8uv=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe96ac033..e3c58c6c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM python:3.13.2-slim-bookworm +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ # 工作目录 WORKDIR /MaiMBot @@ -10,8 +11,9 @@ COPY maim_message /maim_message # 安装依赖 RUN pip install --upgrade pip -RUN pip install -e /maim_message -RUN pip install --upgrade -r requirements.txt +#RUN pip install uv +RUN uv pip install -e /maim_message +RUN uv pip install --upgrade -r requirements.txt # 复制项目代码 COPY . . From b1cd3bc9440a185fc0354797398c9a29aca6b053 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Apr 2025 13:01:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E7=94=A8uv=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3c58c6c0..eb2ddbbc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ COPY maim_message /maim_message # 安装依赖 RUN pip install --upgrade pip #RUN pip install uv -RUN uv pip install -e /maim_message -RUN uv pip install --upgrade -r requirements.txt +RUN pip install -e /maim_message +RUN uv pip install -r requirements.txt # 复制项目代码 COPY . . From ebf9790f581bfcaf73a7c90e396f7c2a022b22ae Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Apr 2025 13:03:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E7=94=A8uv=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb2ddbbc7..ceacbb39d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,10 @@ COPY requirements.txt . COPY maim_message /maim_message # 安装依赖 -RUN pip install --upgrade pip +RUN uv pip install --system --upgrade pip #RUN pip install uv -RUN pip install -e /maim_message -RUN uv pip install -r requirements.txt +RUN uv pip install --system -e /maim_message +RUN uv pip install --system -r requirements.txt # 复制项目代码 COPY . . From 4920d0d41de4e4b6a52d16d8aec1e0373556b019 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Apr 2025 13:23:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8uv=E5=8A=A0=E9=80=9F?= =?UTF-8?q?=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ceacbb39d..838e2b993 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ COPY maim_message /maim_message # 安装依赖 RUN uv pip install --system --upgrade pip -#RUN pip install uv RUN uv pip install --system -e /maim_message RUN uv pip install --system -r requirements.txt From c4ab4ff037085a4a3ccb7158a0b58269588b4b39 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Apr 2025 15:03:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ci(docker):=20=E4=BC=98=E5=8C=96=20Docker?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=20=E4=B8=BA=20refactor=20=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=20-=20=E8=AE=BE=E7=BD=AE=20Docker=E9=95=9C=E5=83=8F=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=20-=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20OpenContainer=20=E6=A0=87=E5=87=86=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a5a6680cd..29fd6fd44 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -13,6 +13,9 @@ on: jobs: build-and-push: runs-on: ubuntu-latest + env: + DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USERNAME }} + DATE_TAG: $(date -u +'%Y-%m-%dT%H-%M-%S') steps: - name: Checkout code uses: actions/checkout@v4 @@ -40,7 +43,7 @@ jobs: elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" == "refs/heads/refactor" ]; then # 新增 refactor 分支处理 - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor" >> $GITHUB_OUTPUT + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT fi - name: Build and Push Docker Image @@ -52,4 +55,7 @@ jobs: tags: ${{ steps.tags.outputs.tags }} push: true cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache - cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max \ No newline at end of file + 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