diff --git a/build/erpnext-nginx/Dockerfile b/build/erpnext-nginx/Dockerfile index 3f6f758b..31abf795 100644 --- a/build/erpnext-nginx/Dockerfile +++ b/build/erpnext-nginx/Dockerfile @@ -6,6 +6,7 @@ FROM node:${NODE_IMAGE_TAG} ARG GIT_REPO=https://github.com/frappe/erpnext ARG GIT_BRANCH=develop +ARG FRAPPE_BRANCH=${GIT_BRANCH} COPY build/erpnext-nginx/install_app.sh /install_app RUN chmod +x /install_app && \ @@ -14,7 +15,7 @@ RUN chmod +x /install_app && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -RUN /install_app erpnext ${GIT_REPO} ${GIT_BRANCH} +RUN /install_app erpnext ${GIT_REPO} ${GIT_BRANCH} ${FRAPPE_BRANCH} FROM ${DOCKER_REGISTRY_PREFIX}/frappe-nginx:${IMAGE_TAG} diff --git a/build/erpnext-nginx/install_app.sh b/build/erpnext-nginx/install_app.sh index a0d7d42d..49aee3d0 100755 --- a/build/erpnext-nginx/install_app.sh +++ b/build/erpnext-nginx/install_app.sh @@ -3,6 +3,7 @@ APP_NAME=${1} APP_REPO=${2} APP_BRANCH=${3} +FRAPPE_BRANCH=${4} [ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" @@ -12,7 +13,7 @@ echo -e "frappe\n${APP_NAME}" > /home/frappe/frappe-bench/sites/apps.txt mkdir -p apps cd apps -git clone --depth 1 https://github.com/frappe/frappe ${BRANCH} +git clone --depth 1 https://github.com/frappe/frappe -b ${FRAPPE_BRANCH} git clone --depth 1 ${APP_REPO} ${BRANCH} ${APP_NAME} echo "Install frappe NodeJS dependencies . . ."