From 1c8f93796b41f90adff40e39a1d1f70ccff6c6bc Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Sat, 19 Mar 2022 11:00:15 +0300 Subject: [PATCH] Use assets builder in custom_app tutorial --- custom_app/frontend.Dockerfile | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/custom_app/frontend.Dockerfile b/custom_app/frontend.Dockerfile index 382608f5..3733feeb 100644 --- a/custom_app/frontend.Dockerfile +++ b/custom_app/frontend.Dockerfile @@ -1,22 +1,5 @@ ARG FRAPPE_VERSION -FROM node:14-bullseye-slim as prod_node_modules - -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - git \ - build-essential \ - python \ - ca-certificates \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR /root/frappe-bench -RUN mkdir -p sites/assets - -ARG FRAPPE_VERSION -RUN git clone --depth 1 -b ${FRAPPE_VERSION} https://github.com/frappe/frappe apps/frappe - -RUN yarn --cwd apps/frappe - +FROM frappe/assets-builder:${FRAPPE_VERSION} as prod_node_modules ARG APP_NAME COPY . apps/${APP_NAME} @@ -34,13 +17,13 @@ ARG APP_NAME RUN yarn --cwd apps/${APP_NAME} # Build assets -RUN echo "frappe\n${APP_NAME}" >sites/apps.txt \ +RUN echo "frappe\nerpnext\n${APP_NAME}" >sites/apps.txt \ && yarn --cwd apps/frappe production --app ${APP_NAME} \ && rm sites/apps.txt -FROM frappe/frappe-nginx:${FRAPPE_VERSION} +FROM frappe/erpnext-nginx:${FRAPPE_VERSION} ARG APP_NAME