Merge branch 'Buggithubissue': fix(pool) Bug #28 release 后账号依旧不可用

Author: guanshangshui

.github/workflows/docker-build-push.yml

@@ -28,10 +28,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
@@ -67,56 +67,53 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Compute image names
         id: names
         shell: bash
         run: |
           # GHCR 要求小写
-          ghcr_image="ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/outlook-email-plus"
-          echo "ghcr_image=$ghcr_image" >> "$GITHUB_OUTPUT"
+          echo "ghcr_image=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/outlook-email-plus" >> "$GITHUB_OUTPUT"
 
           if [ -n "${{ secrets.DOCKERHUB_USERNAME }}" ] && [ -n "${{ secrets.DOCKERHUB_TOKEN }}" ]; then
             echo "dockerhub_enabled=true" >> "$GITHUB_OUTPUT"
-            echo "images=$ghcr_image,${{ env.DOCKERHUB_IMAGE }}" >> "$GITHUB_OUTPUT"
+            echo "images=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/outlook-email-plus,${{ env.DOCKERHUB_IMAGE }}" >> "$GITHUB_OUTPUT"
           else
             echo "dockerhub_enabled=false" >> "$GITHUB_OUTPUT"
-            echo "images=$ghcr_image" >> "$GITHUB_OUTPUT"
+            echo "images=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/outlook-email-plus" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Log in to GHCR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Log in to Docker Hub (optional)
         if: steps.names.outputs.dockerhub_enabled == 'true'
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: ${{ steps.names.outputs.images }}
           tags: |
             type=ref,event=branch
-            # tag push 直接使用 Git tag，避免 branch 模板在 tag 事件里生成非法标签
-            type=ref,event=tag
-            type=sha,prefix=sha-
+            type=sha,prefix={{branch}}-
             type=raw,value=latest,enable=${{ github.ref_name == 'main' || github.ref_name == 'master' }}
 
       - name: Build and push Docker image
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

README.md

@@ -256,8 +256,6 @@ ALLOW_LOGIN_PASSWORD_CHANGE=false
 - IMAP
 - APScheduler
 
-友链：https://linux.do
-
 也参考了以下项目的思路：
 
 - [assast/outlookEmail](https://github.com/assast/outlookEmail)