Docker improvements

build.docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
-  tradapp-build:
+  build:
-    image: microsoft/aspnetcore-build:1.1.0-projectjson
+    image: sebastianstehle/aspnetcore-build:1.1.0-projectjson-phantomjs
     volumes:
       - .:/sln
     working_dir: /sln

build.sh

@@ -1,5 +1,13 @@
 #!bin/bash
 set -e
+cd src/Squidex
+npm install
+npm rebuild node-sass
+npm rebuild phantomjs-prebuilt
+npm run test:coverage
+npm run build:copy
+npm run build
+cd ../..
 dotnet restore
 dotnet test tests/Squidex.Core.Tests/project.json
 dotnet test tests/Squidex.Infrastructure.Tests/project.json

src/Squidex/Deploy.bat

@@ -1,14 +0,0 @@
-SET configuration=Release
-
-REM Restore all Packages
-dotnet restore
-
-REM publish packages
-dotnet publish -c %configuration%
-
-REM Deploy the Publish Folder to IIS
-"C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" ^
-	-verb:sync -source:contentPath="%~dp0bin\%configuration%\netcoreapp1.1\publish" ^
-	-enableRule:AppOffline ^
-	-allowUntrusted:true ^
-	-dest:contentPath=squidex,ComputerName=https://5.175.5.234:8172/msdeploy.axd?site=squidex,UserName=DeploymentUser,Password=1q2w3e$R,AuthType='Basic ^

src/Squidex/project.json

@@ -86,12 +86,6 @@
   },
 
   "scripts": {
-    "prepublish": [
-      "npm install",
-	  "npm rebuild node-sass",
-      "npm run-script build:copy",
-      "npm run-script build"
-    ],
     "postpublish": [
       "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
     ]