LENS-326 : Fix docker after dist changes (Sharad Agarwal via amareshwari)
Conflicts:
lens-docker/lens-test/Dockerfile
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/3c6077ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/3c6077ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/3c6077ad
Branch: refs/heads/master
Commit: 3c6077ade09af7515b45658f842742d472be2789
Parents: 2e210e9
Author: Amareshwari Sriramadasu <amareshw...@apache.org>
Authored: Thu Feb 19 10:20:15 2015 +0530
Committer: Amareshwari Sriramadasu <amareshw...@apache.org>
Committed: Thu Feb 19 10:21:58 2015 +0530
----------------------------------------------------------------------
lens-docker/lens-test/Dockerfile | 6 +++---
lens-docker/lens-test/lens-bootstrap.sh | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3c6077ad/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index eafbfea..31f3882 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -17,10 +17,10 @@
FROM inmobi/docker-hive
-ENV LENS_VERSION 2.0.0-incubating-SNAPSHOT
+ENV LENS_VERSION apache-lens-2.0.0-incubating-SNAPSHOT
ENV BASEDIR /opt/lens
-ENV LENS_HOME $BASEDIR/lens-dist/target/lens-dist-${LENS_VERSION}-server/
-ENV LENS_CLIENT
$BASEDIR/lens-client-dist/target/lens-client-dist-${LENS_VERSION}-client/
+ENV LENS_HOME
$BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/server
+ENV LENS_CLIENT
$BASEDIR/lens-dist/target/${LENS_VERSION}-bin/${LENS_VERSION}-bin/client
ENV LENS_SERVER_CONF $LENS_HOME/conf-pseudo-distr/
ENV LENS_CLIENT_CONF $LENS_CLIENT/conf-pseudo-distr/
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/3c6077ad/lens-docker/lens-test/lens-bootstrap.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/lens-bootstrap.sh
b/lens-docker/lens-test/lens-bootstrap.sh
index 23ed307..1c61603 100644
--- a/lens-docker/lens-test/lens-bootstrap.sh
+++ b/lens-docker/lens-test/lens-bootstrap.sh
@@ -25,15 +25,15 @@ echo "LENS_CLIENT_CONF " $LENS_CLIENT_CONF
#start hive bootstrap script
/etc/hive-bootstrap.sh
-echo "Waiting for 10 secs for servers to start ..."
-sleep 10
+echo "Waiting for 20 secs for servers to start ..."
+sleep 20
#start lens server
echo "Starting Lens server..."
$LENS_HOME/bin/lens-ctl start --conf $LENS_SERVER_CONF
-echo "Waiting for 20 secs for Lens Server to start ..."
-sleep 20
+echo "Waiting for 40 secs for Lens Server to start ..."
+sleep 40
#Setting up client
$LENS_CLIENT/bin/run-examples.sh sample-metastore --conf $LENS_CLIENT_CONF
