accounting/frappe_docker
2
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2025-01-23 23:28:27 +00:00
Code Issues Releases Activity

fix: erpnext image build errors

Browse Source
This commit is contained in:
Revant Nandgaonkar 2020-06-28 00:22:23 +05:30
parent 7106124a07
commit 18e8f05c9f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/erpnext-nginx/Dockerfile
View File

@ -6,6 +6,7 @@ COPY build/erpnext-nginx/install_app.sh /install_app
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
RUN /install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} RUN /install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH}
ARG GIT_BRANCH=develop
FROM frappe/frappe-nginx:${GIT_BRANCH} FROM frappe/frappe-nginx:${GIT_BRANCH}
COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/

2
build/erpnext-worker/Dockerfile
View File

@ -1,5 +1,5 @@
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
FROM frappe/frappe-worker:${GIT_BRANCH}} FROM frappe/frappe-worker:${GIT_BRANCH}
ARG GIT_BRANCH=develop ARG GIT_BRANCH=develop
RUN install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} RUN install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH}

4
travis.py
View File

@ -35,9 +35,7 @@ def git_version(service, version, branch):
return version_tag return version_tag
def build(service, tag, image, branch): def build(service, tag, image, branch):
build_args = '' build_args = f'--build-arg GIT_BRANCH={branch}'
if branch != 'develop':
build_args = f'--build-arg GIT_BRANCH={branch}'
if service == 'nginx' and branch == 'version-11': if service == 'nginx' and branch == 'version-11':
build_args += f' --build-arg NODE_IMAGE_TAG=10-prod' build_args += f' --build-arg NODE_IMAGE_TAG=10-prod'