]> git.nbdom.net Git - nb.git/commitdiff
docker.sh
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Sat, 19 Nov 2016 16:18:20 +0000 (16:18 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Sat, 19 Nov 2016 16:18:20 +0000 (16:18 +0000)
etc/profile.d/docker.sh

index 8f519ecc13fcd55d55194fa7cbacf6158a22f7a3..1d84132a738a16c2cf125fb1dbd72e9bb8f5b7a0 100644 (file)
@@ -9,12 +9,13 @@ which docker > /dev/null || return 0
 
 unset DOCKER_IP
 if [ -z "$MYVIMRC" ]; then
+
   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')
+    DOCKER_IP=$(docker-machine ip "$DOCKER_MACHINE_NAME")
   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_machine_shared() {