docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bash startup script on mac

This commit is contained in:
Jeffrey Morgan 2015-07-14 00:10:36 -07:00
parent 65d6b97b82
commit 9c45387256
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt
View File

Binary file not shown.

18
osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh
View File

@ -6,9 +6,15 @@ ISO=$HOME/.docker/machine/cache/boot2docker.iso
VM=dev VM=dev
DOCKER_MACHINE=/usr/local/bin/docker-machine DOCKER_MACHINE=/usr/local/bin/docker-machine
BLUE='\033[0;34m'
GREEN='\033[0;32m'
NC='\033[0m'
unset DYLD_LIBRARY_PATH unset DYLD_LIBRARY_PATH
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH
clear
mkdir -p ~/.docker/machine/cache mkdir -p ~/.docker/machine/cache
if [ ! -f $ISO ]; then if [ ! -f $ISO ]; then
cp /usr/local/share/boot2docker/boot2docker.iso $ISO cp /usr/local/share/boot2docker/boot2docker.iso $ISO
@ -24,10 +30,9 @@ else
fi fi
echo "Starting machine $VM..." echo "Starting machine $VM..."
$DOCKER_MACHINE start dev $DOCKER_MACHINE start $VM
echo "Setting environment variables for machine $VM..." echo "Setting environment variables for machine $VM..."
eval $($DOCKER_MACHINE env dev --shell=bash)
clear clear
cat << EOF cat << EOF
@ -44,7 +49,12 @@ cat << EOF
EOF EOF
echo "The Quick Start CLI is configured to use Docker with the $VM VM" echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}"
echo echo
bash -c "$SHELL" if [[ $SHELL == *"fish" ]]; then
$SHELL -c "eval ($DOCKER_MACHINE env $VM)"
else
$SHELL -c "eval $($DOCKER_MACHINE env $VM)"
fi