From 39416e19a0b4d225f3c4fc49d7b344362a2da387 Mon Sep 17 00:00:00 2001
From: Mario Loriedo <mloriedo@redhat.com>
Date: Wed, 28 Dec 2016 12:41:18 +0100
Subject: [PATCH] Minor dockerfiles build fixes

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
---
 dockerfiles/action/build.sh                     |  2 +-
 dockerfiles/base/build.sh                       |  2 +-
 .../base/scripts/base/commands/cmd_debug.sh     |  4 ++--
 dockerfiles/build-all.sh                        | 17 ++++++++++-------
 dockerfiles/che/Dockerfile.centos               |  3 ++-
 dockerfiles/che/build.sh                        |  2 +-
 dockerfiles/cli/build.sh                        |  2 +-
 dockerfiles/dev/build.sh                        |  2 +-
 dockerfiles/dir/build.sh                        |  2 +-
 dockerfiles/init/build.sh                       |  2 +-
 dockerfiles/ip/build.sh                         |  2 +-
 dockerfiles/launcher/build.sh                   |  2 +-
 dockerfiles/mount/build.sh                      |  2 +-
 dockerfiles/test/build.sh                       |  2 +-
 14 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/dockerfiles/action/build.sh b/dockerfiles/action/build.sh
index 3b9a780005..5bcdf3874b 100755
--- a/dockerfiles/action/build.sh
+++ b/dockerfiles/action/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-action"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/base/build.sh b/dockerfiles/base/build.sh
index 29c53184b0..0b16033bfa 100755
--- a/dockerfiles/base/build.sh
+++ b/dockerfiles/base/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-base"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/base/scripts/base/commands/cmd_debug.sh b/dockerfiles/base/scripts/base/commands/cmd_debug.sh
index c66b4f1702..c50c18ce8c 100644
--- a/dockerfiles/base/scripts/base/commands/cmd_debug.sh
+++ b/dockerfiles/base/scripts/base/commands/cmd_debug.sh
@@ -17,8 +17,8 @@ cmd_debug() {
   info ""
   info "-----------  ${CHE_PRODUCT_NAME} INFO  ------------"
   info "${CHE_PRODUCT_NAME}_VERSION           = ${CHE_VERSION}"
-  info "${CHE_PRODUCT_NAME}_INSTANCE              = ${CHE_HOST_INSTANCE}"
-  info "${CHE_PRODUCT_NAME}_CONFIG                = ${CHE_HOST_CONFIG}"
+  info "${CHE_PRODUCT_NAME}_INSTANCE          = ${CHE_HOST_INSTANCE}"
+  info "${CHE_PRODUCT_NAME}_CONFIG            = ${CHE_HOST_CONFIG}"
   info "${CHE_PRODUCT_NAME}_HOST              = ${CHE_HOST}"
   info "${CHE_PRODUCT_NAME}_REGISTRY          = ${CHE_MANIFEST_DIR}"
   info "${CHE_PRODUCT_NAME}_DEVELOPMENT_MODE  = ${CHE_DEVELOPMENT_MODE}"
diff --git a/dockerfiles/build-all.sh b/dockerfiles/build-all.sh
index 6377838088..507738be02 100755
--- a/dockerfiles/build-all.sh
+++ b/dockerfiles/build-all.sh
@@ -10,7 +10,7 @@ set -e
 set -u
 
 . ./build.include
-init
+init "$@"
 
 # loop on all libraries first
 for directory in lib*/ ; do
@@ -24,12 +24,15 @@ done
 
 # loop on all directories and call build.sh script if present
 for directory in */ ; do
-  if [ -e ${directory}/build.sh ] ; then
-   echo "Call buid.sh from ${directory}"
-   ${directory}build.sh "$@"
- else
-   echo "skipping ${directory}"
- fi
+  if [[ ${directory} == lib*/ ]] ; then
+    # skipping lib directory
+    :
+  elif [ -e ${directory}/build.sh ] ; then
+    echo "Call buid.sh from ${directory}"
+    ${directory}build.sh "$@"
+  else
+    echo "skipping ${directory}"
+  fi
 done
 
 
diff --git a/dockerfiles/che/Dockerfile.centos b/dockerfiles/che/Dockerfile.centos
index 2fbc7000a7..0a10da999a 100644
--- a/dockerfiles/che/Dockerfile.centos
+++ b/dockerfiles/che/Dockerfile.centos
@@ -27,7 +27,8 @@ ENV LANG=C.UTF-8 \
     PATH=${PATH}:${JAVA_HOME}/bin \
     CHE_HOME=/home/user/che \
     DOCKER_VERSION=1.6.0 \
-    DOCKER_BUCKET=get.docker.com
+    DOCKER_BUCKET=get.docker.com \
+    CHE_IN_CONTAINER=true
 
 RUN yum -y update && \
     yum -y install openssl java sudo && \
diff --git a/dockerfiles/che/build.sh b/dockerfiles/che/build.sh
index 1a1750836f..ea72e6cf94 100755
--- a/dockerfiles/che/build.sh
+++ b/dockerfiles/che/build.sh
@@ -27,4 +27,4 @@ echo "Linking assembly ${BUILD_ASSEMBLY_ZIP} --> ${LOCAL_ASSEMBLY_ZIP}"
 ln ${BUILD_ASSEMBLY_ZIP} ${LOCAL_ASSEMBLY_ZIP}
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/cli/build.sh b/dockerfiles/cli/build.sh
index 906fe4d62e..db60588359 100755
--- a/dockerfiles/cli/build.sh
+++ b/dockerfiles/cli/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-cli"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/dev/build.sh b/dockerfiles/dev/build.sh
index 6532c7d61f..91f70adea7 100755
--- a/dockerfiles/dev/build.sh
+++ b/dockerfiles/dev/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-dev"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/dir/build.sh b/dockerfiles/dir/build.sh
index 563eefe521..771da769cc 100755
--- a/dockerfiles/dir/build.sh
+++ b/dockerfiles/dir/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-dir"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/init/build.sh b/dockerfiles/init/build.sh
index 457fb6d5d9..172b1791ce 100755
--- a/dockerfiles/init/build.sh
+++ b/dockerfiles/init/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-init"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/ip/build.sh b/dockerfiles/ip/build.sh
index 6139b5ba5a..5bb8f276f0 100755
--- a/dockerfiles/ip/build.sh
+++ b/dockerfiles/ip/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-ip"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/launcher/build.sh b/dockerfiles/launcher/build.sh
index acdcc851eb..051063df3e 100755
--- a/dockerfiles/launcher/build.sh
+++ b/dockerfiles/launcher/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-launcher"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/mount/build.sh b/dockerfiles/mount/build.sh
index 91378135d9..70e442af45 100755
--- a/dockerfiles/mount/build.sh
+++ b/dockerfiles/mount/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-mount"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build
diff --git a/dockerfiles/test/build.sh b/dockerfiles/test/build.sh
index 0e0500a01f..9feb274880 100755
--- a/dockerfiles/test/build.sh
+++ b/dockerfiles/test/build.sh
@@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-test"
 . $(cd "$(dirname "$0")"; pwd)/../build.include
 
 init "$@"
-build "$@"
+build