IGNITE-1046 Added default option libs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f57aa921 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f57aa921 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f57aa921 Branch: refs/heads/ignite-950 Commit: f57aa921e7ac7b583b0f31931890f1f9454f3b1a Parents: 9de7d24 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jun 26 13:06:45 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jun 26 13:06:45 2015 +0300 ---------------------------------------------------------------------- modules/docker/execute.sh | 4 ++++ modules/docker/run.sh | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f57aa921/modules/docker/execute.sh ---------------------------------------------------------------------- diff --git a/modules/docker/execute.sh b/modules/docker/execute.sh index 2aaaa2d..e0ed90c 100644 --- a/modules/docker/execute.sh +++ b/modules/docker/execute.sh @@ -8,6 +8,10 @@ if [ ! -z "$GIT_REPO" ]; then fi fi +if [ -z "$OPTION_LIBS" ]; then + OPTION_LIBS="ignite-log4j" +fi + if [ ! -z "$OPTION_LIBS" ]; then IFS=, LIBS_LIST=("$OPTION_LIBS") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f57aa921/modules/docker/run.sh ---------------------------------------------------------------------- diff --git a/modules/docker/run.sh b/modules/docker/run.sh index 42fb29d..2e3110d 100644 --- a/modules/docker/run.sh +++ b/modules/docker/run.sh @@ -1,11 +1,16 @@ #!/bin/bash -if [ -z $SKIP_DOWNLOAD ]; then - ./download_ignite.sh -fi +IGNITE_VERSION="" if [ -z $SKIP_BUILD_LIBS ]; then ./build_users_libs.sh + + IGNITE_VERSION=$(mvn -f user-repo/pom.xml dependency:list | grep ':ignite-core:jar:.*:' | \ + sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p') +fi + +if [ -z $SKIP_DOWNLOAD ]; then + IGNITE_VERSION=$IGNITE_VERSION ./download_ignite.sh fi ./execute.sh \ No newline at end of file
