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

Merge pull request #207 from dotnet/brthor/fixdockerbuild

Browse source 
Fix Docker Postbuild Imports
This commit is contained in:
Bryan Thornbury 2015-11-16 16:37:07 -08:00
commit eb2678a657
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/docker/dockerpostbuild.sh
View file

@ -8,9 +8,9 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/_common.sh" source "$DIR/../_common.sh"
cd $DIR/.. cd $DIR/../..
[ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnetcli-build" [ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnetcli-build"
[ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnetcli-build-container" [ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnetcli-build-container"
@ -20,11 +20,6 @@ cd $DIR/..
info "Building docker container" info "Building docker container"
docker build -t $DOTNET_BUILD_CONTAINER_TAG scripts/docker/ docker build -t $DOTNET_BUILD_CONTAINER_TAG scripts/docker/
# First thing make sure all of our build containers are stopped
info "Terminating and cleaning all running containers"
docker stop $DOTNET_BUILD_CONTAINER_NAME
docker rm $DOTNET_BUILD_CONTAINER_NAME
# Remove the sticky bit on directories created by docker so we can delete them # Remove the sticky bit on directories created by docker so we can delete them
info "Cleaning directories created by docker build" info "Cleaning directories created by docker build"
docker run --rm \ docker run --rm \

4
scripts/docker/dockerrun.sh
View file

@ -8,9 +8,9 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/_common.sh" source "$DIR/../_common.sh"
cd $DIR/.. cd $DIR/../..
[ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnetcli-build" [ -z "$DOTNET_BUILD_CONTAINER_TAG" ] && DOTNET_BUILD_CONTAINER_TAG="dotnetcli-build"
[ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnetcli-build-container" [ -z "$DOTNET_BUILD_CONTAINER_NAME" ] && DOTNET_BUILD_CONTAINER_NAME="dotnetcli-build-container"