Merge pull request #192 from dotnet-architecture/revert-191-revert-19…

…0-fix-mac-ci-build Revert "Revert "Fix mac ci build""
dotnet-architecture · May 7, 2017 · 860d699 · 860d699
2 parents 51fcd6b + e0c96de
commit 860d699
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cli-mac/build-bits.sh b/cli-mac/build-bits.sh
@@ -10,6 +10,12 @@ projectList=(
     "../src/Web/WebStatus"
 )
 
+
+pushd $(pwd)/../src/Web/WebSPA
+npm install
+npm rebuild node-sass
+popd 
+
 for project in "${projectList[@]}"
 do
     echo -e "\e[33mWorking on $(pwd)/$project"

diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
@@ -6,5 +6,5 @@ services:
     volumes:
       - .:/src
     working_dir: /src
-    command: /bin/bash -c "dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm install && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"