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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sean Li 2015-07-14 11:48:31 -07:00
parent 8f8e385daf 7291c75daa
commit 90317c762d
2 changed files with 1 additions and 6 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.

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

@ -52,9 +52,4 @@ EOF
echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}" echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}"
echo echo
if [[ $SHELL == *"fish" ]]; then eval $($DOCKER_MACHINE env $VM --shell=bash)
$SHELL -c "eval ($DOCKER_MACHINE env $VM)"
else
$SHELL -c "eval $($DOCKER_MACHINE env $VM)"
fi