fixed boot2docker init and ignored my dockercfg (has auth information)

moveTools
Adam Veldhousen 2015-06-05 10:53:08 -05:00
parent 142104e65f
commit 5e0149f16b
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
3 changed files with 4 additions and 6 deletions

View File

@ -41,16 +41,13 @@ function clone()
# sshs into boot2docker # sshs into boot2docker
function b2d() { function b2d() {
if [ -n $(ps | grep .boot2docker) ]; then b2dinit
b2dinit
fi
boot2docker ssh boot2docker ssh
} }
function b2dinit() function b2dinit()
{ {
if [ -n $(ps | grep .boot2docker) ]; then if [[ -n $(ps -A | grep ".boot2docker") ]]; then
echo "Initializing boot2docker" echo "Initializing boot2docker"
boot2docker init > /dev/null boot2docker init > /dev/null
export DOCKER_HOST=tcp://$(boot2docker ip):2376 export DOCKER_HOST=tcp://$(boot2docker ip):2376

2
.gitignore vendored
View File

@ -19,7 +19,7 @@ _*
*.dll *.dll
tags tags
*.orig *.orig
.dockercfg
.gnupg .gnupg

View File

@ -35,3 +35,4 @@ if [ -d ~/.nvm ]; then
fi fi
printmotd printmotd
b2dinit