Merge remote-tracking branch 'upstream/develop' into install_app

build/erpnext-nginx/Dockerfile

@@ -0,0 +1,16 @@
+FROM bitnami/node:12-prod
+
+COPY build/erpnext-nginx/install_app.sh /install_app
+
+RUN /install_app erpnext https://github.com/frappe/erpnext
+
+FROM frappe/frappe-assets:develop
+
+COPY --from=0 /home/frappe/frappe-bench/sites/ /var/www/html/
+COPY --from=0 /rsync /rsync
+RUN echo -n "\nerpnext" >> /var/www/html/apps.txt
+
+VOLUME [ "/assets" ]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]