Minor dockerfiles build fixes

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
6.19.x
Mario Loriedo 2016-12-28 12:41:18 +01:00 committed by Mario Loriedo
parent 915f32f7b7
commit 39416e19a0
14 changed files with 25 additions and 21 deletions

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-action"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-base"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -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}"

View File

@ -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

View File

@ -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 && \

View File

@ -27,4 +27,4 @@ echo "Linking assembly ${BUILD_ASSEMBLY_ZIP} --> ${LOCAL_ASSEMBLY_ZIP}"
ln ${BUILD_ASSEMBLY_ZIP} ${LOCAL_ASSEMBLY_ZIP}
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-cli"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-dev"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-dir"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-init"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-ip"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-launcher"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-mount"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build

View File

@ -9,4 +9,4 @@ IMAGE_NAME="eclipse/che-test"
. $(cd "$(dirname "$0")"; pwd)/../build.include
init "$@"
build "$@"
build