From 508af3af2c4765e20a2ac7caff74358cf92c1ecb Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sat, 19 Nov 2016 16:18:20 +0000 Subject: [PATCH] docker.sh --- etc/profile.d/docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh index 8f519ecc..1d84132a 100644 --- a/etc/profile.d/docker.sh +++ b/etc/profile.d/docker.sh @@ -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() { -- 2.47.3