Merge pull request dotnet#23 from sdmaclea/PR-CLEANUP-AND-BINFMT

Cleanup ubuntu/16

Author: mmitche

src/ubuntu/14.04/cross/Dockerfile

@@ -1,3 +1,3 @@
 FROM microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-crossdeps
 
-ADD rootfs crossrootfs
+ADD rootfs.tar crossrootfs

src/ubuntu/16.04/Dockerfile

@@ -11,13 +11,11 @@ RUN apt-get update && \
     apt-get update && \
     apt-get install -y \
             cmake \
-            clang-3.5 \
             clang-3.9 \
-            liblldb-3.9-dev && \
+            liblldb-3.9-dev \
             lldb-3.9 \
-            llvm-3.5 \
             llvm-3.9 \
-            make \
+            make && \
     apt-get clean
 
 # Install tools used by the VSO build automation.  nodejs-legacy is a Debian specific

src/ubuntu/16.04/cross/Dockerfile

@@ -1,3 +1,3 @@
 FROM microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-crossdeps
 
-ADD rootfs crossrootfs
+ADD rootfs.tar crossrootfs

src/ubuntu/16.04/cross/arm64/Dockerfile

@@ -6,4 +6,4 @@ RUN apt-get update \
         binutils-aarch64-linux-gnu \
     && rm -rf /var/lib/apt/lists/*
 
-ADD rootfs crossrootfs
+ADD rootfs.tar crossrootfs

src/ubuntu/16.04/crossdeps/Dockerfile

@@ -2,20 +2,15 @@ FROM microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-coredeps
 
 # Install the base toolchain we need to build anything (clang, cmake, make and the like).
 RUN apt-get update \
-    && apt-get install -y wget \
-    && echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list \
-    && wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - \
-    && apt-get update \
     && apt-get install -y \
         binfmt-support \
         binutils-arm-linux-gnueabihf \
-        clang-3.6 \
         cmake \
         debootstrap \
-        llvm-3.6 \
         make \
         qemu \
         qemu-user-static \
+        wget \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \

src/ubuntu/build-scripts/build-rootfs.sh

@@ -10,22 +10,66 @@ crossToolset=$2
 archArg=${3:-}
 lldb=${4:-}
 
-scriptsVolume="scripts$(date +%s)"
 dockerCrossDepsTag="microsoft/dotnet-buildtools-prereqs:${os}-crossdeps"
 
-echo "Using $dockerCrossDepsTag to clone core-setup to fetch scripts used to build cross-toolset"
-docker run --rm -v $scriptsVolume:/scripts $dockerCrossDepsTag git clone https://github.com/dotnet/core-setup /scripts
-
-rm -rf $PWD/rootfs
-mkdir rootfs
+rm -rf $PWD/rootfs.tar
 
 # If argument three was set, use that as the only arch, otherwise use default list of arches : 'arm x86'
 crossArchArray=(${archArg:-'arm x86'})
 for arch in $crossArchArray
 do
     echo "Using $dockerCrossDepsTag to set up cross-toolset for $arch for $crossToolset"
-    buildRootFSContainer="rootfs-$arch-$crossToolset"
-    docker run --privileged --rm --name $buildRootFSContainer -e ROOTFS_DIR=/rootfs/$arch \
-        -v $PWD/rootfs:/rootfs -v $scriptsVolume:/scripts \
-        $dockerCrossDepsTag /scripts/cross/build-rootfs.sh $arch $crossToolset $lldb --skipunmount
+    buildRootFSContainer="rootfs-$arch-$crossToolset-$(date +%s)"
+
+    # Start a detached container running bash
+    docker run --privileged -itd --name $buildRootFSContainer $dockerCrossDepsTag \
+        bash
+
+    if [ $? -ne 0 ]; then
+        echo "Rootfs build failed: detached container failed to start"
+        exit 1
+    fi
+
+    echo "Using $dockerCrossDepsTag to clone core-setup to fetch scripts used to build cross-toolset"
+    docker exec $buildRootFSContainer \
+        git clone https://github.com/dotnet/core-setup /scripts
+
+    if [ $? -ne 0 ]; then
+        echo "Rootfs build failed: `git clone https://github.com/dotnet/core-setup /scripts` returned error"
+        docker rm -f $buildRootFSContainer
+        exit 1
+    fi
+
+    echo "Running build-rootfs.sh"
+    docker exec -e ROOTFS_DIR=/rootfs/$arch $buildRootFSContainer \
+         /scripts/cross/build-rootfs.sh $arch $crossToolset $lldb --skipunmount
+
+    if [ $? -ne 0 ]; then
+        echo "Rootfs build failed: build-rootfs.sh returned error"
+        docker rm -f $buildRootFSContainer
+        exit 1
+    fi
+
+    echo "Checking existence of /rootfs/$arch/bin"
+    docker exec $buildRootFSContainer \
+        [ -d /rootfs/$arch/bin ]
+
+    if [ $? -ne 0 ]; then
+        echo "Rootfs build failed: rootfs/$arch/bin empty"
+        docker rm -f $buildRootFSContainer
+        exit 1
+    fi
+
+    echo "Tarring rootfs"
+    docker exec $buildRootFSContainer \
+        tar Ccf /rootfs - . >> $PWD/rootfs.tar
+
+    if [ $? -ne 0 ]; then
+        echo "Rootfs build failed: 'tar Ccf /rootfs - .' returned error"
+        docker rm -f $buildRootFSContainer
+        exit 1
+    fi
+
+    echo "Shutting down container"
+    docker rm -f $buildRootFSContainer
 done