feat: enhance docker workflow with PR validation (#16)

* feat: enhance docker workflow with PR validation

* fix: correct workflow conditions for PR builds

* refactor: simplify release workflow and version control

* fix: add missing steps in docker job

* chore: bump version to 1.0.4

Author: IM594

.github/workflows/docker-publish.yml

@@ -23,33 +23,21 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.PAT }}
 
-      - name: Setup Git
-        run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          
-      - name: Get latest version
-        id: get_version
-        run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
-          echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV
-          
-          # 从package.json中获取当前版本
-          if [ -f "package.json" ]; then
-            CURRENT_VERSION=$(node -p "require('./package.json').version" 2>/dev/null || echo "0.0.0")
-            echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-          else
-            echo "CURRENT_VERSION=0.0.0" >> $GITHUB_ENV
-          fi
-
       - name: Check version
         id: check_version
         run: |
+          # 从package.json获取版本
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          
+          # 获取最新tag
+          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
           LATEST_VERSION=${LATEST_TAG#v}
+          
           if [ "$LATEST_VERSION" = "$CURRENT_VERSION" ]; then
+            echo "版本号未变化，跳过发布"
             echo "SKIP_RELEASE=true" >> $GITHUB_ENV
-            echo "Versions are identical ($LATEST_VERSION), skipping release process"
           else
+            echo "检测到新版本，将创建release"
             echo "SKIP_RELEASE=false" >> $GITHUB_ENV
           fi
 
@@ -64,36 +52,63 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
 
-  build:
+  docker:
     runs-on: ubuntu-latest
-    needs: release
-    if: github.event_name == 'pull_request'
+    needs: [release]
+    if: |
+      github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.release.outputs.SKIP_RELEASE != 'true'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build only
+      - name: Get version from package.json
+        id: package-version
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+        
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: im594/mininote-md
+          tags: |
+            type=raw,value=latest
+            type=raw,value=${{ steps.package-version.outputs.version }}
+            type=sha,prefix=sha-
+        
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: false
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=im594/mininote-md:buildcache
-          
-  publish:
+          cache-to: type=registry,ref=im594/mininote-md:buildcache,mode=max
+
+  pr_docker:
     runs-on: ubuntu-latest
-    needs: release
-    if: |
-      github.event_name == 'push' && 
-      github.ref == 'refs/heads/main' && 
-      needs.release.outputs.SKIP_RELEASE != 'true'
+    if: github.event_name == 'pull_request'
     steps:
+      - name: Set PR status
+        run: |
+          echo "Running in PR mode - will build and test with temporary tag"
+          
       - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+        
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Get version from package.json
         id: package-version
@@ -107,12 +122,7 @@ jobs:
         with:
           images: im594/mininote-md
           tags: |
-            type=raw,value=latest
-            type=raw,value={{version}}
-            type=sha,prefix=sha-
-        
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+            type=raw,value=pr-${{ github.event.pull_request.number }}
         
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -128,4 +138,9 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=im594/mininote-md:buildcache
-          cache-to: type=registry,ref=im594/mininote-md:buildcache,mode=max
+          cache-to: type=registry,ref=im594/mininote-md:buildcache,mode=max
+
+      - name: Cleanup PR image
+        run: |
+          TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.DOCKERHUB_TOKEN }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
+          curl -X DELETE -H "Authorization: JWT ${TOKEN}" https://hub.docker.com/v2/repositories/im594/mininote-md/tags/pr-${{ github.event.pull_request.number }}/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mininote-md",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "backend/src/server.js",
   "scripts": {
     "start": "node backend/src/server.js",