From 5c72b750ff91ca5cd08b8b88e6e983b9c3a32fcc Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Sat, 19 Nov 2016 12:12:47 +0000 Subject: [PATCH] docker.sh --- etc/profile.d/docker.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh index 2d3623a6..019694fe 100644 --- 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() { -- 2.47.3