DOCKER_DIR

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 648ef7d4c7ad56dd37c9f4fe9d2b5ab584df9a8c..40590ae5a2aebed8b39e75cfd8da709f85d8eee8 100644 (file)
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -1,10 +1,12 @@
 which docker > /dev/null || return 0
-[ -z "$DOCKER_DIR" -a -d "~nico/owncloud/Docker" ] && DOCKER_DIR="~nico/owncloud/Docker"
 
 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 && eval "$(docker-machine env docker)" 2>/dev/null
 fi
 
+[ -z "$DOCKER_DIR" -a -d "~nico/owncloud/Docker" ] && DOCKER_DIR="~nico/owncloud/Docker"
+DOCKER_IP=$(perl -e '$ENV{DOCKER_HOST} =~ /\D(\d+\.\d+\.\d+\.\d+)\D/&&print $1')
+
 docker_build() {
   
   shell_help "Usage: $FUNCNAME [DIR_DOCKERFILE]" "$@" && return
@@ -13,6 +15,8 @@ docker_build() {
 
   if [ -n "$1" ]; then
 
+    [ -z "$DOCKER_DIR" -o -d "$1" ] || cd "$DOCKER_DIR"
+
     if [ -d "$1" ]; then
       pwd=$(pwd)
       cd "$1" || return
@@ -32,10 +36,10 @@ docker_build() {
     ex=1
 
   else
-    perl -ne '/^\s*\#\s*DOCKER_BUILD\s*(.*?)$/ and system "$1"' Dockerfile
+    perl -ne '/^\s*\#\s*(DOCKER_BUILD_EXEC_PRE|DOCKER_BUILD)\s*(.*?)$/ and system "$1"' Dockerfile
 
-    echo $FUNCNAME: docker build --rm --force-rm=true --tags $docker_name $@ $docker_name .
-    docker build --rm --force-rm=true -t $@ $docker_name .
+    echo $FUNCNAME: docker build --rm --force-rm=true $@ --tag $docker_name .
+    docker build --rm --force-rm=true $@ --tag $docker_name .
 
     if [ "$?" != 0 ]; then
       docker rmi -f $(docker images -qf "dangling=true")
@@ -43,7 +47,7 @@ docker_build() {
       ex=1
 
     else
-      perl -ne '/^\s*\#\s*DOCKER_BUILD_POST\s*(.*?)$/ and system "$1"' Dockerfile
+      perl -ne '/^\s*\#\s*DOCKER_BUILD_EXEC_POST\s*(.*?)$/ and system "$1"' Dockerfile
       ex=${?:-0}
     fi