mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Refactor docker entrypoint to reduce potential for out of sync build and ci_build scripts

Browse source
This commit is contained in:
Bryan 2015-11-10 16:18:00 -08:00
parent 32e7a71a49
commit cdf8b90494
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build.sh
View file

@ -22,5 +22,16 @@ fi
echo Building dotnet tools verison - $DOTNET_BUILD_VERSION echo Building dotnet tools verison - $DOTNET_BUILD_VERSION
$DIR/scripts/bootstrap.sh if [ ! -z "$BUILD_IN_DOCKER" ]; then
$DIR/scripts/package.sh 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

9
scripts/ci_build.sh
View file

@ -33,14 +33,9 @@ if [[ "$(uname)" == "Linux" ]]; then
[ ! -z "$BUILD_BUILDID" ] && container_name="$BUILD_BUILDID" [ ! -z "$BUILD_BUILDID" ] && container_name="$BUILD_BUILDID"
export DOTNET_BUILD_CONTAINER_NAME="$container_name" export DOTNET_BUILD_CONTAINER_NAME="$container_name"
export PACKAGE_IN_DOCKER="true"
# Build Binaries outside of Docker $SCRIPT_DIR/../build.sh $@
$SCRIPT_DIR/bootstrap.sh $@
# Change Docker Build command to packaging only
export BUILD_COMMAND="/opt/code/scripts/package.sh"
$SCRIPT_DIR/dockerbuild.sh
else else
$SCRIPT_DIR/../build.sh $@ $SCRIPT_DIR/../build.sh $@
fi fi