Update build-push.yml

yybht155 · Aug 6, 2024 · 3e0b694 · 3e0b694
1 parent 878ace8
commit 3e0b694
Showing 1 changed file with 48 additions and 52 deletions.
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -12,58 +12,58 @@ env:
   DIFY_API_IMAGE_NAME: ${{ secrets.DIFY_API_IMAGE_NAME }}
 
 jobs:
-  # build-and-push:
-  #   runs-on: ubuntu-latest
-  #   if: github.event.pull_request.draft == false
-  #   strategy:
-  #     matrix:
-  #       include:
-  #         - service_name: "web"
-  #           image_name_env: "DIFY_WEB_IMAGE_NAME"
-  #           context: "web"
-  #         - service_name: "api"
-  #           image_name_env: "DIFY_API_IMAGE_NAME"
-  #           context: "api"
-  #   steps:
-  #     - name: Set up QEMU
-  #       uses: docker/setup-qemu-action@v3
+  build-and-push:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    strategy:
+      matrix:
+        include:
+          - service_name: "web"
+            image_name_env: "DIFY_WEB_IMAGE_NAME"
+            context: "web"
+          - service_name: "api"
+            image_name_env: "DIFY_API_IMAGE_NAME"
+            context: "api"
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-  #     - name: Login to CI
-  #       uses: docker/login-action@v2
-  #       with:
-  #         registry: ${{ secrets.CI_HOSTNAME }}
-  #         username: ${{ secrets.CI_USERNAME }}
-  #         password: ${{ secrets.CI_PASSWORD }}
+      - name: Login to CI
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.CI_HOSTNAME }}
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_PASSWORD }}
 
-  #     - name: Extract metadata (tags, labels) for Docker
-  #       id: meta
-  #       uses: docker/metadata-action@v5
-  #       with:
-  #         images: ${{ env[matrix.image_name_env] }}
-  #         tags: |
-  #           type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-  #           type=ref,event=branch
-  #           type=sha,enable=true,priority=100,prefix=,suffix=,format=long
-  #           type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env[matrix.image_name_env] }}
+          tags: |
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+            type=ref,event=branch
+            type=sha,enable=true,priority=100,prefix=,suffix=,format=long
+            type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
 
-  #     - name: Build and push
-  #       uses: docker/build-push-action@v6
-  #       with:
-  #         context: "{{defaultContext}}:${{ matrix.context }}"
-  #         platforms: 'linux/arm64'
-  #         build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-  #         push: true
-  #         tags: ${{ steps.meta.outputs.tags }}
-  #         labels: ${{ steps.meta.outputs.labels }}
-  #         cache-from: type=gha
-  #         cache-to: type=gha,mode=max
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:${{ matrix.context }}"
+          platforms: 'linux/arm64'
+          build-args: COMMIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   deploy-jp:
     runs-on: ubuntu-latest
-    # needs: build-and-push
+    needs: build-and-push
     steps:
       - name: Configure Login
         run: |
@@ -82,15 +82,11 @@ jobs:
           SSH_KEY: ${{ secrets.PKEY }}
           SSH_HOST: ${{ secrets.ENDPOINT }}
 
-      - name: Login to CI
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.CI_HOSTNAME }}
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_PASSWORD }}
-
       - name: Pull Image & Restart
         run: |
           ssh jp 'cd /data/dify && docker-compose pull api web --ignore-pull-failures'
+      
+      - name: Restart
+        run: |
           ssh jp 'cd /data/dify && docker-compose restart'
           ssh jp 'cd /data/dify && docker rmi $(docker images -f "dangling=true" -q)'