adam
/
laughing-hipster
mirror of https://github.com/adamveld12/laughing-hipster
1
0
Fork 0
Code Issues Releases Wiki Activity

updated boot2docker stuff to use on functon for all platforms instead of two

moveTools
Adam Veldhousen 2015-06-12 11:32:07 -05:00
parent 91db1cb878
commit 0e96076c3a
Signed by: adam
GPG Key ID: 6DB29003C6DD1E4B
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.bash_functions
View File

@ -41,35 +41,17 @@ function clone()
# sshs into boot2docker # sshs into boot2docker
function b2d() { function b2d() {
if [[ ${WINDOWS} == "TRUE" ]]; then b2dinit
b2dinitW
else
b2dinit
fi
boot2docker ssh boot2docker ssh
} }
function b2dinitW() function b2dinit() {
{ if [[ -n $(ps -ae | grep ".boot2docker") || -n $(tasklist.exe | grep "VBoxHeadless") ]]; then
if [[ -n $(tasklist.exe | grep "VBoxHeadless") ]]; then
echo "Initializing boot2docker" echo "Initializing boot2docker"
boot2docker.exe init > /dev/null boot2docker init &> /dev/null
boot2docker.exe up > /dev/null boot2docker up &> /dev/null
export DOCKER_HOST=tcp://$(boot2docker.exe ip):2376
export DOCKER_CERT_PATH=~/../.boot2docker/certs/boot2docker-vm
export DOCKER_TLS_VERIFY=1
fi
}
function b2dinit()
{
if [[ -n $(ps -ae | grep ".boot2docker") ]]; then
echo "Initializing boot2docker"
boot2docker init > /dev/null
boot2docker up > /dev/null
export DOCKER_HOST=tcp://$(boot2docker ip):2376 export DOCKER_HOST=tcp://$(boot2docker ip):2376
export DOCKER_CERT_PATH=~/.boot2docker/certs/boot2docker-vm export DOCKER_CERT_PATH=~/../.boot2docker/certs/boot2docker-vm
export DOCKER_TLS_VERIFY=1 export DOCKER_TLS_VERIFY=1
fi fi
} }

7
.profile
View File

@ -35,9 +35,4 @@ if [ -d ~/.nvm ]; then
fi fi
printmotd printmotd
b2dinit
if [[ ${WINDOWS} == "TRUE" ]]; then
b2dinitW
else
b2dinit
fi