This commit is contained in:
Lev 2021-11-06 20:33:10 +03:00
parent fcac4893cd
commit 3f08e00850
2 changed files with 8 additions and 7 deletions

View file

@ -50,11 +50,11 @@ jobs:
- name: Push - name: Push
uses: docker/bake-action@v1.6.0 uses: docker/bake-action@v1.6.0
# if: env.IS_AUTHORIZED_RUN == 'true' if: env.IS_AUTHORIZED_RUN == 'true'
with: with:
files: docker-bake.hcl files: docker-bake.hcl
targets: bench-build targets: bench-build
push: false push: true
build_frappe: build_frappe:
name: Frappe name: Frappe
@ -85,17 +85,17 @@ jobs:
run: ./tests/test-frappe.sh run: ./tests/test-frappe.sh
- name: Push - name: Push
# if: env.IS_AUTHORIZED_RUN == 'true' if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/bake-action@v1.6.0 uses: docker/bake-action@v1.6.0
with: with:
files: docker-bake.hcl files: docker-bake.hcl
targets: frappe-develop targets: frappe-develop
push: false push: true
build_erpnext: build_erpnext:
name: ERPNext name: ERPNext
runs-on: ubuntu-latest runs-on: ubuntu-latest
# needs: build_frappe needs: build_frappe
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@ -121,9 +121,9 @@ jobs:
run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh
- name: Push - name: Push
# if: env.IS_AUTHORIZED_RUN == 'true' if: env.IS_AUTHORIZED_RUN == 'true'
uses: docker/bake-action@v1.6.0 uses: docker/bake-action@v1.6.0
with: with:
files: docker-bake.hcl files: docker-bake.hcl
targets: erpnext-develop targets: erpnext-develop
push: false push: true

View file

@ -47,6 +47,7 @@ variable "VERSION" {}
target "stable-args" { target "stable-args" {
args = { args = {
GIT_TAG = "${GIT_TAG}"
GIT_BRANCH = "${GIT_BRANCH}" GIT_BRANCH = "${GIT_BRANCH}"
IMAGE_TAG = "${GIT_BRANCH}" IMAGE_TAG = "${GIT_BRANCH}"
} }