docker.sh

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 2d3623a61a1f2ae53679870814b09bc61614d359..019694fecaf7d616708d094c4653629201c721c2 100644 (file)
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -7,9 +7,14 @@ which docker > /dev/null || return 0
 [ -d ~/ownCloud/Docker ] && export DOCKER_HOME=~/ownCloud/Docker
 [ -z "$DOCKER_HUB" ] && DOCKER_HUB=""
 
+unset DOCKER_IP
 if [ -z "$MYVIMRC" ]; then
-  [ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] && which docker-machine>/dev/null && docker-machine ls -q 2>/dev/null |grep -qFm1 "$DOCKER_MACHINE_NAME" && eval "$(docker-machine env "$DOCKER_MACHINE_NAME")" 2>/dev/null
-  export DOCKER_IP=$(perl -e '$ENV{DOCKER_HOST} =~ /\D(\d+\.\d+\.\d+\.\d+)\D/&&print $1')
+  if [ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] && which docker-machine>/dev/null && docker-machine ls -q 2>/dev/null |grep -qFm1 "$DOCKER_MACHINE_NAME"; then
+    eval "$(docker-machine env "$DOCKER_MACHINE_NAME")" 2>/dev/null
+    DOCKER_IP=$(perl -e '$ENV{DOCKER_HOST} =~ /\D(\d+\.\d+\.\d+\.\d+)\D/&&print $1')
+  fi
+  export DOCKER_IP
+  #[ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] && which docker-machine>/dev/null && docker-machine ls -q 2>/dev/null |grep -qFm1 "$DOCKER_MACHINE_NAME" && eval "$(docker-machine env "$DOCKER_MACHINE_NAME")" 2>/dev/null
 fi
 
 docker_build() {