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

Reorder stages in nginx image, improve perfomance

Browse Source
This commit is contained in:
Lev Vereshchagin 2021-12-15 10:06:44 +03:00
parent 03a9e54afd
commit 790968e799
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/nginx/Dockerfile
View File

@ -1,4 +1,3 @@
# TODO: Add errorpages
FROM node:14-bullseye-slim as base FROM node:14-bullseye-slim as base
RUN apt-get update \ RUN apt-get update \
@ -40,17 +39,6 @@ RUN yarn run production \
COPY --from=frappe_node_modules /root/frappe-bench/apps/frappe/node_modules /root/frappe-bench/sites/assets/frappe/ COPY --from=frappe_node_modules /root/frappe-bench/apps/frappe/node_modules /root/frappe-bench/sites/assets/frappe/
FROM nginx:1.21-alpine as frappe
COPY --from=frappe_assets /root/frappe-bench/sites /usr/share/nginx/html
COPY nginx-template.conf /
CMD [ "/bin/sh" , "-c" , "envsubst '${BACKEND} ${SOCKETIO} ${FRAPPE_SITE_NAME_HEADER}' </nginx-template.conf >/etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'" ]
# Next stages are relevant to ERPNext.
# Builds are much more efficient if we reuse Frappe assets and Node modules.
FROM base as erpnext_node_modules FROM base as erpnext_node_modules
ARG ERPNEXT_VERSION ARG ERPNEXT_VERSION
@ -63,13 +51,13 @@ RUN yarn --cwd ../erpnext --prod
FROM erpnext_node_modules as erpnext_assets FROM erpnext_node_modules as erpnext_assets
RUN mkdir -p ../../sites/assets/erpnext
RUN yarn --cwd ../erpnext
# Reuse development node_modules from frappe_assets # Reuse development node_modules from frappe_assets
COPY --from=frappe_assets /root/frappe-bench/apps/frappe/node_modules /root/frappe-bench/apps/frappe/node_modules COPY --from=frappe_assets /root/frappe-bench/apps/frappe/node_modules /root/frappe-bench/apps/frappe/node_modules
COPY --from=frappe_assets /root/frappe-bench/apps/frappe/package.json /root/frappe-bench/apps/frappe/yarn.lock /root/frappe-bench/apps/frappe/ COPY --from=frappe_assets /root/frappe-bench/apps/frappe/package.json /root/frappe-bench/apps/frappe/yarn.lock /root/frappe-bench/apps/frappe/
RUN mkdir -p ../../sites/assets/erpnext
RUN yarn --cwd ../erpnext
RUN yarn run production --app erpnext \ RUN yarn run production --app erpnext \
&& cp -R ../erpnext/erpnext/public/* ../../sites/assets/erpnext \ && cp -R ../erpnext/erpnext/public/* ../../sites/assets/erpnext \
&& rm ../../sites/apps.txt && rm ../../sites/apps.txt
@ -78,6 +66,14 @@ RUN yarn run production --app erpnext \
COPY --from=erpnext_node_modules /root/frappe-bench/apps/erpnext/node_modules /root/frappe-bench/apps/erpnext/node_modules COPY --from=erpnext_node_modules /root/frappe-bench/apps/erpnext/node_modules /root/frappe-bench/apps/erpnext/node_modules
FROM nginx:1.21-alpine as frappe
COPY --from=frappe_assets /root/frappe-bench/sites /usr/share/nginx/html
COPY nginx-template.conf /
CMD [ "/bin/sh" , "-c" , "envsubst '${BACKEND} ${SOCKETIO} ${FRAPPE_SITE_NAME_HEADER}' </nginx-template.conf >/etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'" ]
FROM frappe as erpnext FROM frappe as erpnext
COPY --from=erpnext_assets /root/frappe-bench/sites /usr/share/nginx/html COPY --from=erpnext_assets /root/frappe-bench/sites /usr/share/nginx/html