epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-27 09:15:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update custom app builds according to new main dockerfiles

Browse source
This commit is contained in:
Lev Vereshchagin 2022-03-20 20:41:00 +03:00
parent beb908903a
commit 7c624a3e2b
2 changed files with 21 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
custom_app/backend.Dockerfile
View file

@ -1,8 +1,17 @@
ARG FRAPPE_VERSION ARG FRAPPE_VERSION
FROM frappe/erpnext-worker:${FRAPPE_VERSION} FROM frappe/erpnext-worker:${FRAPPE_VERSION}
ARG APP_NAME USER root
COPY --chown=frappe . ../apps/${APP_NAME}
RUN echo "frappe\nerpnext\n${APP_NAME}" >/home/frappe/frappe-bench/sites/apps.txt \ ARG APP_NAME
&& ../env/bin/pip install --no-cache-dir -e ../apps/${APP_NAME} COPY . ../apps/${APP_NAME}
RUN install-app ${APP_NAME}
# or with git:
# ARG APP_NAME
# ARG BRANCH
# ARG GIT_URL
# RUN install-assets ${APP_NAME} ${BRANCH} ${GIT_URL}
USER frappe

34
custom_app/frontend.Dockerfile
View file

@ -1,35 +1,17 @@
ARG FRAPPE_VERSION ARG FRAPPE_VERSION
FROM frappe/assets-builder:${FRAPPE_VERSION} as prod_node_modules FROM frappe/assets-builder:${FRAPPE_VERSION} as assets
ARG APP_NAME ARG APP_NAME
COPY . apps/${APP_NAME} COPY . apps/${APP_NAME}
RUN install-app ${APP_NAME}
# Install production node modules # or with git:
RUN yarn --cwd apps/${APP_NAME} --prod # ARG APP_NAME
# ARG BRANCH
# ARG GIT_URL
# RUN install-app ${APP_NAME} ${BRANCH} ${GIT_URL}
FROM prod_node_modules as assets
ARG APP_NAME
# Install development node modules
RUN yarn --cwd apps/${APP_NAME}
# Build assets
RUN echo "frappe\nerpnext\n${APP_NAME}" >sites/apps.txt \
&& yarn --cwd apps/frappe production --app ${APP_NAME} \
&& rm sites/apps.txt
FROM frappe/erpnext-nginx:${FRAPPE_VERSION} FROM frappe/erpnext-nginx:${FRAPPE_VERSION}
ARG APP_NAME COPY --from=assets /out /usr/share/nginx/html
# Copy all not built assets
COPY --from=prod_node_modules /root/frappe-bench/apps/${APP_NAME}/${APP_NAME}/public /usr/share/nginx/html/assets/${APP_NAME}
# Copy production node modules
COPY --from=prod_node_modules /root/frappe-bench/apps/${APP_NAME}/node_modules /usr/share/nginx/html/assets/${APP_NAME}/node_modules
# Copy built assets
COPY --from=assets /root/frappe-bench/sites /usr/share/nginx/html