accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-12-25 11:20:02 +00:00
Code Issues Releases Activity

Merge pull request #486 from revant/fix-custom-branch-build

Browse Source 
feat: allow custom frappe branch during asset image build
This commit is contained in:
Revant Nandgaonkar 2021-06-08 17:01:45 +05:30 committed by GitHub
commit 2e6d11aa4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/erpnext-nginx/Dockerfile
View File

@ -6,6 +6,7 @@ FROM node:${NODE_IMAGE_TAG}
ARG GIT_REPO=https://github.com/frappe/erpnext ARG GIT_REPO=https://github.com/frappe/erpnext
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
ARG FRAPPE_BRANCH=${GIT_BRANCH}
COPY build/erpnext-nginx/install_app.sh /install_app COPY build/erpnext-nginx/install_app.sh /install_app
RUN chmod +x /install_app && \ RUN chmod +x /install_app && \
@ -14,7 +15,7 @@ RUN chmod +x /install_app && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* 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} FROM ${DOCKER_REGISTRY_PREFIX}/frappe-nginx:${IMAGE_TAG}

3
build/erpnext-nginx/install_app.sh
View File

@ -3,6 +3,7 @@
APP_NAME=${1} APP_NAME=${1}
APP_REPO=${2} APP_REPO=${2}
APP_BRANCH=${3} APP_BRANCH=${3}
FRAPPE_BRANCH=${4}
[ "${APP_BRANCH}" ] && BRANCH="-b ${APP_BRANCH}" [ "${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 mkdir -p apps
cd 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} git clone --depth 1 ${APP_REPO} ${BRANCH} ${APP_NAME}
echo "Install frappe NodeJS dependencies . . ." echo "Install frappe NodeJS dependencies . . ."