From 06b17048d3857138771ec1f9d6859ddb9652dc32 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 2 Oct 2020 06:11:46 +0530
Subject: [PATCH 1/2] fix(frappe-nginx): node-sass is part of prod dependencies

---
 build/frappe-nginx/Dockerfile |  8 ++++++--
 build/frappe-nginx/build.sh   | 18 ------------------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100755 build/frappe-nginx/build.sh

diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile
index d360f87f..191d72bf 100644
--- a/build/frappe-nginx/Dockerfile
+++ b/build/frappe-nginx/Dockerfile
@@ -25,8 +25,12 @@ 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/build.sh /build.sh
-RUN /build.sh
+RUN cd /home/frappe/frappe-bench/apps/frappe \
+    && yarn \
+    && yarn run production \
+    && rm -fr node_modules \
+    && yarn install --production=true
+
 RUN node --version \
     && npm --version \
     && yarn --version
diff --git a/build/frappe-nginx/build.sh b/build/frappe-nginx/build.sh
deleted file mode 100755
index f9b01dbb..00000000
--- a/build/frappe-nginx/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-function nodeCleanUp() {
-    rm -fr node_modules
-    yarn install --production=true
-}
-
-cd /home/frappe/frappe-bench/apps/frappe
-yarn
-yarn run production
-
-if [[ "$GIT_BRANCH" =~ ^(version-12|version-11)$ ]]; then
-    nodeCleanUp
-else
-    nodeCleanUp
-    # remove this when frappe framework moves this to dependencies from devDependencies
-    yarn add node-sass
-fi

From e2e103e181b8f0fa0a2ccfce7fd34effdd7a8153 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 2 Oct 2020 12:45:13 +0530
Subject: [PATCH 2/2] tests: mount assets-vol for migrate command test

---
 tests/docker-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docker-test.sh b/tests/docker-test.sh
index 4a30e678..0a0d8c45 100755
--- a/tests/docker-test.sh
+++ b/tests/docker-test.sh
@@ -347,6 +347,7 @@ echo -e "\e[1m\e[4mMigrate command in edge container\e[0m"
 docker run -it \
     -e "MAINTENANCE_MODE=1" \
     -v frappebench00_sites-vol:/home/frappe/frappe-bench/sites \
+    -v frappebench00_assets-vol:/home/frappe/frappe-bench/sites/assets \
     --network frappebench00_default \
     frappe/erpnext-worker:edge migrate