diff --git a/build/erpnext-nginx/Dockerfile b/build/erpnext-nginx/Dockerfile index 7eb1d2e6..5e88c5fd 100644 --- a/build/erpnext-nginx/Dockerfile +++ b/build/erpnext-nginx/Dockerfile @@ -6,6 +6,7 @@ COPY build/erpnext-nginx/install_app.sh /install_app ARG GIT_BRANCH=develop RUN /install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} +ARG GIT_BRANCH=develop FROM frappe/frappe-nginx:${GIT_BRANCH} COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/ diff --git a/build/erpnext-worker/Dockerfile b/build/erpnext-worker/Dockerfile index 32dd3348..6f6296ab 100644 --- a/build/erpnext-worker/Dockerfile +++ b/build/erpnext-worker/Dockerfile @@ -1,5 +1,5 @@ ARG GIT_BRANCH=develop -FROM frappe/frappe-worker:${GIT_BRANCH}} +FROM frappe/frappe-worker:${GIT_BRANCH} ARG GIT_BRANCH=develop RUN install_app erpnext https://github.com/frappe/erpnext ${GIT_BRANCH} diff --git a/travis.py b/travis.py index 40edf5c5..854e9313 100755 --- a/travis.py +++ b/travis.py @@ -35,9 +35,7 @@ def git_version(service, version, branch): return version_tag def build(service, tag, image, branch): - build_args = '' - if branch != 'develop': - build_args = f'--build-arg GIT_BRANCH={branch}' + build_args = f'--build-arg GIT_BRANCH={branch}' if service == 'nginx' and branch == 'version-11': build_args += f' --build-arg NODE_IMAGE_TAG=10-prod'