From b675085c755bfa7510be005b82aa5a6fc74d7de4 Mon Sep 17 00:00:00 2001 From: Lev Vereshchagin Date: Wed, 22 Dec 2021 17:03:05 +0300 Subject: [PATCH] Don't install `svg-sprite` and `sass` node modules in nginx image on linux/arm64 (https://github.com/frappe/frappe/pull/15275) --- build/nginx/Dockerfile | 7 +------ custom_app/frontend.Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index 9c6a2cd0..e23453ea 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -26,12 +26,7 @@ RUN yarn --cwd apps/frappe --prod FROM frappe_prod_node_modules as frappe_assets # Install development node modules -RUN cd apps/frappe && \ - if [ "$(uname -m)" = "aarch64" ]; then \ - yarn remove svg-sprite || true \ - && yarn add sass; \ - fi \ - && yarn +RUN yarn --cwd apps/frappe # Build assets they're stored in frappe-bench/sites/assets RUN echo "frappe" >sites/apps.txt \ diff --git a/custom_app/frontend.Dockerfile b/custom_app/frontend.Dockerfile index 1d6e8f2b..382608f5 100644 --- a/custom_app/frontend.Dockerfile +++ b/custom_app/frontend.Dockerfile @@ -15,12 +15,7 @@ RUN mkdir -p sites/assets ARG FRAPPE_VERSION RUN git clone --depth 1 -b ${FRAPPE_VERSION} https://github.com/frappe/frappe apps/frappe -RUN cd apps/frappe \ - && if [ "$(uname -m)" = "aarch64" ]; then \ - yarn remove svg-sprite || true \ - && yarn add sass; \ - fi \ - && yarn +RUN yarn --cwd apps/frappe ARG APP_NAME