diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml index 62a5ba03..edd93d5b 100644 --- a/.github/workflows/build_develop.yml +++ b/.github/workflows/build_develop.yml @@ -1,20 +1,19 @@ name: Develop build on: - # toggle commenting to run on PR - # pull_request: - # branches: - # - main - # paths: - # - images/nginx/** - # - images/socketio/** - # - images/worker/** - # - overrides/** - # - tests/** - # - compose.yaml - # - docker-bake.hcl - # - example.env - # - .github/workflows/build_develop.yml + pull_request: + branches: + - main + paths: + - images/nginx/** + - images/socketio/** + - images/worker/** + - overrides/** + - tests/** + - compose.yaml + - docker-bake.hcl + - example.env + - .github/workflows/build_develop.yml schedule: # Every day at 12:00 pm @@ -28,6 +27,7 @@ jobs: with: repo: erpnext version: develop + platform: linux/amd64 push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index c2408855..541ef715 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 + platform: + required: true + type: string secrets: DOCKERHUB_USERNAME: required: true @@ -51,7 +54,9 @@ jobs: - name: Build uses: docker/bake-action@v1.7.0 with: + set: "*.platform=${{ inputs.platform }}" push: true + env: REGISTRY_USER: localhost:5000/frappe