post review changes (untested)

This commit is contained in:
Al Majumdar 2022-04-03 16:50:07 +05:30
parent a8761f5d7a
commit 5e244dba00
4 changed files with 5 additions and 5 deletions

View file

@ -35,7 +35,6 @@ jobs:
uses: docker/bake-action@v1.7.0 uses: docker/bake-action@v1.7.0
with: with:
targets: bench-test targets: bench-test
set: "*.platform=${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64' }}"
- name: Login - name: Login
if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
@ -50,3 +49,4 @@ jobs:
with: with:
targets: bench targets: bench
push: true push: true
set: "*.platform=linux/amd64,linux/arm64"

View file

@ -28,7 +28,7 @@ jobs:
repo: erpnext repo: erpnext
version: develop version: develop
push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
platforms: ${{ github.event_name != 'pull_request' && 'linux/amd64,linux/arm64' || 'linux/amd64' }} platforms: linux/amd64,linux/arm64
secrets: secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

View file

@ -40,7 +40,7 @@ jobs:
repo: erpnext repo: erpnext
version: "13" version: "13"
push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
platforms: linux/amd64 platforms: linux/amd64,linux/arm64
secrets: secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@ -51,7 +51,7 @@ jobs:
repo: erpnext repo: erpnext
version: "13" version: "13"
push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} push: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
platforms: linux/amd64 platforms: linux/amd64,linux/arm64
secrets: secrets:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

View file

@ -56,7 +56,6 @@ jobs:
uses: docker/bake-action@v1.7.0 uses: docker/bake-action@v1.7.0
with: with:
push: true push: true
set: "*.platform=${{ inputs.platforms }}"
env: env:
REGISTRY_USER: localhost:5000/frappe REGISTRY_USER: localhost:5000/frappe
@ -88,3 +87,4 @@ jobs:
uses: docker/bake-action@v1.7.0 uses: docker/bake-action@v1.7.0
with: with:
push: true push: true
set: "*.platform=${{ inputs.platforms }}"