Merge pull request #359 from revant/fix-node-sass

fix(frappe-nginx): node-sass is part of prod dependencies

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

build/frappe-nginx/build.sh

@@ -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

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