updated boot2docker stuff to use on functon for all platforms instead of two
parent
91db1cb878
commit
0e96076c3a
|
|
@ -41,35 +41,17 @@ function clone()
|
|||
|
||||
# sshs into boot2docker
|
||||
function b2d() {
|
||||
if [[ ${WINDOWS} == "TRUE" ]]; then
|
||||
b2dinitW
|
||||
else
|
||||
b2dinit
|
||||
fi
|
||||
|
||||
b2dinit
|
||||
boot2docker ssh
|
||||
}
|
||||
|
||||
function b2dinitW()
|
||||
{
|
||||
if [[ -n $(tasklist.exe | grep "VBoxHeadless") ]]; then
|
||||
function b2dinit() {
|
||||
if [[ -n $(ps -ae | grep ".boot2docker") || -n $(tasklist.exe | grep "VBoxHeadless") ]]; then
|
||||
echo "Initializing boot2docker"
|
||||
boot2docker.exe init > /dev/null
|
||||
boot2docker.exe 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
|
||||
boot2docker init &> /dev/null
|
||||
boot2docker up &> /dev/null
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue