From 9c3cea17b92cd5bf7e6c2dbf9595006eb49604c8 Mon Sep 17 00:00:00 2001 From: Al Majumdar <88921269+restlessronin@users.noreply.github.com> Date: Sat, 2 Apr 2022 10:40:09 +0530 Subject: [PATCH] untested but should work --- .github/workflows/build_develop.yml | 2 ++ .github/workflows/build_stable.yml | 4 ++++ .github/workflows/docker-build-push.yml | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index a852c953..22a881b9 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -28,6 +28,8 @@ jobs: repo: erpnext version: develop push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + env: + MULTI_ARCH_BUILD: ${{ github.event_name != 'pull_request' }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml index 2795ec60..f403b82c 100644 --- a/.github/workflows/build_stable.yml +++ b/.github/workflows/build_stable.yml @@ -40,6 +40,8 @@ jobs: repo: erpnext version: "13" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + env: + MULTI_ARCH_BUILD: ${{ github.event_name != 'pull_request' }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} @@ -50,6 +52,8 @@ jobs: repo: erpnext version: "13" push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} + env: + MULTI_ARCH_BUILD: ${{ github.event_name != 'pull_request' }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index c2408855..215c1db3 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -14,6 +14,9 @@ on: push: required: true type: boolean + env: + MULTI_ARCH_BUILD: + required: true secrets: DOCKERHUB_USERNAME: required: true @@ -54,6 +57,7 @@ jobs: push: true env: REGISTRY_USER: localhost:5000/frappe + MULTI_ARCH_BUILD: ${{ env.MULTI_ARCH_BUILD }} - name: Setup Python uses: actions/setup-python@v3