From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 14 Jan 2017 19:56:21 +0000 (+0000)
Subject: docker
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=284d76cc3e27fa11bade3f836d86e19b08d20557;p=nb.git

docker
---

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 1ae7c544..bb634640 100644
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -1,14 +1,8 @@
 #
 # etc/profile.d/docker.sh
 #
-which docker > /dev/null || return 0
-
 [ -z "$DOCKER_MACHINE_NAME" ] && DOCKER_MACHINE_NAME="docker"
-[ -d $CLOUD_DIR/Docker ] && export DOCKER_HOME=$CLOUD_DIR/Docker
-[ -z "$DOCKER_HUB" ] && DOCKER_HUB=""
 
-# Docker env only if `is_prompt` !!!
-# NB 26.12.16 if is_prompt && which docker-machine > /dev/null && [ -z "$MYVIMRC" ]; then
 if which docker-machine >/dev/null; then
 
   if [ -z "$DOCKER_CERT_PATH" -o ! -e "$DOCKER_CERT_PATH" ] \
@@ -19,6 +13,11 @@ if which docker-machine >/dev/null; then
 
 fi
 
+which docker > /dev/null || return 0
+
+[ -d $CLOUD_DIR/Docker ] && export DOCKER_HOME=$CLOUD_DIR/Docker
+# NB 14.01.17 [ -z "$DOCKER_HUB" ] && DOCKER_HUB=""
+
 docker_build() {
   
   shell_help "Usage: $FUNCNAME [DIR_DOCKERFILE]" "$@" && return