Merge pull request #173 from brthor/docker_package

Change CI Build to only build packages inside of docker

build.sh

@@ -22,5 +22,16 @@ fi
 
 echo Building dotnet tools verison - $DOTNET_BUILD_VERSION
 
-$DIR/scripts/bootstrap.sh
-$DIR/scripts/package.sh
+if [ ! -z "$BUILD_IN_DOCKER" ]; then
+    export BUILD_COMMAND="/opt/code/scripts/bootstrap.sh"
+    $DIR/scripts/dockerbuild.sh
+else
+    $DIR/scripts/bootstrap.sh
+fi
+
+if [ ! -z "$PACKAGE_IN_DOCKER" ]; then
+    export BUILD_COMMAND="/opt/code/scripts/package.sh"
+    $DIR/scripts/dockerbuild.sh
+else
+    $DIR/scripts/package.sh
+fi    

scripts/bootstrap.sh

@@ -49,6 +49,26 @@ dotnet restore "$REPOROOT" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.1
 [ -d "$STAGE1_DIR" ] && rm -Rf "$STAGE1_DIR"
 
 banner "Building corehost"
+
+# Set up the environment to be used for building with clang.
+if which "clang-3.5" > /dev/null 2>&1
+    then
+        export CC="$(which clang-3.5)"
+        export CXX="$(which clang++-3.5)"
+elif which "clang-3.6" > /dev/null 2>&1
+    then
+        export CC="$(which clang-3.6)"
+        export CXX="$(which clang++-3.6)"
+elif which clang > /dev/null 2>&1
+    then
+        export CC="$(which clang)"
+        export CXX="$(which clang++)"
+else
+    error "Unable to find Clang Compiler"
+    error "Install clang-3.5 or clang3.6"
+    exit 1
+fi
+
 pushd "$REPOROOT/src/corehost" 2>&1 >/dev/null
 [ -d "cmake/$RID" ] || mkdir -p "cmake/$RID"
 cd "cmake/$RID"

scripts/ci_build.sh

@@ -33,8 +33,9 @@ if [[ "$(uname)" == "Linux" ]]; then
     [ ! -z "$BUILD_BUILDID" ] && container_name="$BUILD_BUILDID"
 
     export DOTNET_BUILD_CONTAINER_NAME="$container_name"
-
-    $SCRIPT_DIR/dockerbuild.sh debian $@
+    export PACKAGE_IN_DOCKER="true"
+    
+    $SCRIPT_DIR/../build.sh $@
 else
     $SCRIPT_DIR/../build.sh $@
 fi