From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 16 Nov 2016 12:02:09 +0000 (+0000)
Subject: docker_run
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=2e5283f83dbfa29e389b2778cebaf7ed44a10a9f;p=nb.git

docker_run
---

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index a2ab585d..f74e9dd7 100644
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -56,12 +56,16 @@ docker_run() {
   [ -z "$docker_name" -a -e "Dockerfile" ] && docker_name=$(basename `pwd`)
   #[ -z "$docker_name" ] && docker_name=$(basename `pwd`)
 
-  [ -z "$(docker images -q "$docker_name")" ] && echo "$FUNCNAME: Can't find image $docker_name. Try docker_build $docker_name" 1>&2 && return
+  if [ -z "$(docker images -q "$docker_name")" ]; then
+    echo "$FUNCNAME: Can't find image $docker_name. Try docker_build $docker_name" 1>&2
 
-  local opt
-  [ -z "$*" ] && opt=$(perl -ne '/^\s*\#\s*DOCKER_RUN\s*(.*?)$/&&print qq|$1 |' Dockerfile 2>/dev/null)
-  echo $FUNCNAME: docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name
-  eval docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name
+  else
+    local opt
+    [ -z "$*" ] && opt=$(perl -ne '/^\s*\#\s*DOCKER_RUN\s*(.*?)$/&&print qq|$1 |' Dockerfile 2>/dev/null)
+    echo $FUNCNAME: docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name
+    eval docker run --rm -it --name $docker_name --hostname $docker_name $opt$@ $docker_name
+
+  fi
 
   [ -n "$pwd" ] && cd "$pwd"
 }