Merge pull request #95 from brthor/dockerci

Run Docker Build in Ubuntu CI
This commit is contained in:
Bryan Thornbury 2015-10-22 12:17:50 -07:00
commit fa57f7f2f2
2 changed files with 6 additions and 2 deletions

View file

@ -7,7 +7,7 @@ def project = 'dotnet/cli'
def osList = ['Ubuntu', 'OSX', 'Windows_NT']
def machineLabelMap = ['Ubuntu':'ubuntu',
def machineLabelMap = ['Ubuntu':'ubuntu-doc',
'OSX':'mac',
'Windows_NT':'windows']

View file

@ -2,7 +2,11 @@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$SCRIPT_DIR/../build.sh $@
if [[ "$(uname)" == "Linux" ]]; then
$SCRIPT_DIR/dockerbuild.sh $@
else
$SCRIPT_DIR/../build.sh $@
fi
ret_code=$?
exit $ret_code