From a3bdc3c8f90f32c6ef6af7d5b532ee40288a930f Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 7 Aug 2020 15:28:15 +0530
Subject: [PATCH] fix: remove nunjucks from nginx image preparation

---
 build/frappe-nginx/Dockerfile                     |  7 ++++---
 build/frappe-nginx/build.sh                       |  8 --------
 build/frappe-nginx/generate_standard_style_css.js | 14 --------------
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 build/frappe-nginx/generate_standard_style_css.js

diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile
index e9147aad..d360f87f 100644
--- a/build/frappe-nginx/Dockerfile
+++ b/build/frappe-nginx/Dockerfile
@@ -1,3 +1,7 @@
+# This image uses nvm and same base image as the worker image.
+# This is done to ensures that node-sass binary remains common.
+# node-sass is required to enable website theme feature used
+# by Website Manager role in Frappe Framework
 FROM bitnami/python:3.7-prod
 
 ENV NVM_DIR=/root/.nvm
@@ -21,9 +25,6 @@ RUN mkdir -p apps sites/assets/css  \
     && cd apps \
     && git clone --depth 1 https://github.com/frappe/frappe --branch $GIT_BRANCH
 
-COPY build/frappe-nginx/generate_standard_style_css.js \
-    /home/frappe/frappe-bench/apps/frappe/generate_standard_style_css.js
-
 COPY build/frappe-nginx/build.sh /build.sh
 RUN /build.sh
 RUN node --version \
diff --git a/build/frappe-nginx/build.sh b/build/frappe-nginx/build.sh
index 0a1d52f5..f9b01dbb 100755
--- a/build/frappe-nginx/build.sh
+++ b/build/frappe-nginx/build.sh
@@ -8,18 +8,10 @@ function nodeCleanUp() {
 cd /home/frappe/frappe-bench/apps/frappe
 yarn
 yarn run production
-# Remove this after python container starts using node command
-yarn add nunjucks -D
 
 if [[ "$GIT_BRANCH" =~ ^(version-12|version-11)$ ]]; then
     nodeCleanUp
 else
-    node generate_standard_style_css.js \
-            frappe/website/doctype/website_theme/website_theme_template.scss > \
-            /home/frappe/standard_templates_string
-    node generate_bootstrap_theme.js \
-            /home/frappe/frappe-bench/sites/assets/css/standard_style.css \
-            "$(cat /home/frappe/standard_templates_string)"
     nodeCleanUp
     # remove this when frappe framework moves this to dependencies from devDependencies
     yarn add node-sass
diff --git a/build/frappe-nginx/generate_standard_style_css.js b/build/frappe-nginx/generate_standard_style_css.js
deleted file mode 100644
index 275ab47d..00000000
--- a/build/frappe-nginx/generate_standard_style_css.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const nunjucks = require("nunjucks");
-
-const templatePath = process.argv[2];
-const pathArray = templatePath.split("/");
-const templateFile = pathArray.pop();
-const templateDir = pathArray.join("/");
-
-nunjucks.configure(templateDir);
-const rendered = nunjucks.render(templateFile, {
-    button_rounded_corners: true,
-    font_properties: "300,600",
-});
-
-console.log(rendered.replace(/\n/gm, "\\n"));