You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ma...@apache.org on 2021/09/08 14:15:28 UTC

[apisix-dashboard] branch master updated: fix: adjust buildx to fix Docker build failed (#2120)

This is an automated email from the ASF dual-hosted git repository.

majunjie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 79012fd  fix: adjust buildx to fix Docker build failed (#2120)
79012fd is described below

commit 79012fd0623636dcb6331c3470aaccca58aad256
Author: qsliu2017 <57...@users.noreply.github.com>
AuthorDate: Wed Sep 8 22:15:21 2021 +0800

    fix: adjust buildx to fix Docker build failed (#2120)
---
 .github/workflows/deploy-with-docker.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml
index 40c9574..3c89834 100644
--- a/.github/workflows/deploy-with-docker.yml
+++ b/.github/workflows/deploy-with-docker.yml
@@ -35,13 +35,6 @@ jobs:
             ${{ runner.os }}-buildx-apisixdashboard-
             ${{ runner.os }}-buildx-
 
-      - uses: Azure/docker-login@v1
-        if: ${{ github.event_name == 'push' }}
-        with:
-          login-server: apisixacr.azurecr.cn
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-
       - name: Build Docker Image
         uses: docker/build-push-action@v2
         with:
@@ -50,6 +43,10 @@ jobs:
           context: .
           build-args: |
             APISIX_DASHBOARD_VERSION=master
+          cache-from: |
+            type=local,src=/tmp/.buildx-cache
+          cache-to: |
+            type=local,dest=/tmp/.buildx-cache
 
       - name: Modify Config
         run: |
@@ -65,7 +62,9 @@ jobs:
         continue-on-error: true
         run: |
           docker buildx bake --load \
-          -f docker-compose.yaml
+          -f docker-compose.yaml \
+          --set *.cache-from=type=local,src=/tmp/.buildx-cache \
+          --set *.cache-to=type=local,dest=/tmp/.buildx-cache
 
       - name: Run Docker Compose
         working-directory: ./api/test/docker-deploy
@@ -77,6 +76,13 @@ jobs:
       - name: Run Test
         run: api/test/shell/manager_smoking.sh -s false
 
+      - uses: Azure/docker-login@v1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          login-server: apisixacr.azurecr.cn
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
       - name: Deploy
         if: ${{ github.event_name == 'push' }}
         run: |