admin/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Don't install svg-sprite and sass node modules in nginx image on linux/arm64 (https://github.com/frappe/frappe/pull/15275)

Browse Source
This commit is contained in:
Lev Vereshchagin
2021-12-22 17:03:05 +03:00
parent d20860f8b9
commit b675085c75
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/nginx/Dockerfile
View File

@@ -26,12 +26,7 @@ RUN yarn --cwd apps/frappe --prod
FROM frappe_prod_node_modules as frappe_assets FROM frappe_prod_node_modules as frappe_assets
# Install development node modules # Install development node modules
RUN cd apps/frappe && \ RUN yarn --cwd apps/frappe
if [ "$(uname -m)" = "aarch64" ]; then \
yarn remove svg-sprite || true \
&& yarn add sass; \
fi \
&& yarn
# Build assets they're stored in frappe-bench/sites/assets # Build assets they're stored in frappe-bench/sites/assets
RUN echo "frappe" >sites/apps.txt \ RUN echo "frappe" >sites/apps.txt \

7
custom_app/frontend.Dockerfile
View File

@@ -15,12 +15,7 @@ RUN mkdir -p sites/assets
ARG FRAPPE_VERSION ARG FRAPPE_VERSION
RUN git clone --depth 1 -b ${FRAPPE_VERSION} https://github.com/frappe/frappe apps/frappe RUN git clone --depth 1 -b ${FRAPPE_VERSION} https://github.com/frappe/frappe apps/frappe
RUN cd apps/frappe \ RUN yarn --cwd apps/frappe
&& if [ "$(uname -m)" = "aarch64" ]; then \
yarn remove svg-sprite || true \
&& yarn add sass; \
fi \
&& yarn
ARG APP_NAME ARG APP_NAME