From b610caba7ead17c30f45832547d459b25ff912b9 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 4 Mar 2020 03:33:23 +0000 Subject: [PATCH] forgot about branches --- build/common/worker/install_app.sh | 6 +++++- build/erpnext-worker/v11.Dockerfile | 2 +- build/erpnext-worker/v12.Dockerfile | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build/common/worker/install_app.sh b/build/common/worker/install_app.sh index 4717312f..e3b9b629 100755 --- a/build/common/worker/install_app.sh +++ b/build/common/worker/install_app.sh @@ -2,6 +2,7 @@ APP_NAME=${1} APP_REPO=${2} +APP_BRANCH=${3} cd /home/frappe/frappe-bench/ @@ -9,5 +10,8 @@ cd /home/frappe/frappe-bench/ cd apps -git clone --depth 1 -o upstream ${APP_REPO} +[ "${APP_BRANCH}" ] && \ + BRANCH="-b ${APP_BRANCH}" + +git clone --depth 1 -o upstream ${APP_REPO} ${BRANCH} pip3 install --no-cache-dir -e /home/frappe/frappe-bench/apps/APP_NAME \ No newline at end of file diff --git a/build/erpnext-worker/v11.Dockerfile b/build/erpnext-worker/v11.Dockerfile index 9f6c9c2a..b17c7aaa 100644 --- a/build/erpnext-worker/v11.Dockerfile +++ b/build/erpnext-worker/v11.Dockerfile @@ -1,3 +1,3 @@ FROM frappe/frappe-worker:v11 -RUN install_app erpnext https://github.com/frappe/erpnext \ No newline at end of file +RUN install_app erpnext https://github.com/frappe/erpnext version-11 \ No newline at end of file diff --git a/build/erpnext-worker/v12.Dockerfile b/build/erpnext-worker/v12.Dockerfile index 734e9286..2bade604 100644 --- a/build/erpnext-worker/v12.Dockerfile +++ b/build/erpnext-worker/v12.Dockerfile @@ -1,3 +1,3 @@ FROM frappe/frappe-worker:v12 -RUN install_app erpnext https://github.com/frappe/erpnext \ No newline at end of file +RUN install_app erpnext https://github.com/frappe/erpnext version-12 \ No newline at end of file