Repository: chukwa Updated Branches: refs/heads/master 0cce2791a -> d38341474
CHUKWA-807. Update Docker support to current. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/d3834147 Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/d3834147 Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/d3834147 Branch: refs/heads/master Commit: d3834147435fa5160014686569d001e74721d940 Parents: 0cce279 Author: Eric Yang <[email protected]> Authored: Sun May 1 16:46:41 2016 -0700 Committer: Eric Yang <[email protected]> Committed: Sun May 1 16:46:41 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ contrib/docker/Dockerfile | 14 +++++++------- contrib/docker/start-all.sh | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3834147/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fa9f7db..4b01e1f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,8 @@ Trunk (unreleased changes) BUGS + CHUKWA-807. Update Docker support to current. (Eric Yang) + CHUKWA-803. Update Solr API to version 5 API. (Eric Yang) CHUKWA-801. Increase measurement timeout for TestFailTailer. (Eric Yang) http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3834147/contrib/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 371d39e..ab77fe0 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -17,14 +17,14 @@ MAINTAINER Apache RUN yum install -y tar wget bind-utils ntpd java-1.7.0-openjdk which openssh-server openssh-clients RUN mkdir -p /opt/apache RUN wget https://www.apache.org/dist/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz -RUN wget https://www.apache.org/dist/hadoop/common/hadoop-2.7.1/hadoop-2.7.1.tar.gz -RUN wget https://www.apache.org/dist/hbase/1.1.1/hbase-1.1.1-bin.tar.gz -RUN wget https://www.apache.org/dist/lucene/solr/4.10.4/solr-4.10.4.tgz -ADD chukwa-0.7.0.tar.gz /opt/apache/ +RUN wget https://www.apache.org/dist/hadoop/common/hadoop-2.7.2/hadoop-2.7.2.tar.gz +RUN wget https://www.apache.org/dist/hbase/1.2.1/hbase-1.2.1-bin.tar.gz +RUN wget https://www.apache.org/dist/lucene/solr/5.5.0/solr-5.5.0.tgz +ADD chukwa-0.8.0.tar.gz /opt/apache/ RUN tar xf zookeeper-3.4.6.tar.gz -C /opt/apache -RUN tar xf hadoop-2.7.1.tar.gz -C /opt/apache -RUN tar xf hbase-1.1.1-bin.tar.gz -C /opt/apache -RUN tar xf solr-4.10.4.tgz -C /opt/apache +RUN tar xf hadoop-2.7.2.tar.gz -C /opt/apache +RUN tar xf hbase-1.2.1-bin.tar.gz -C /opt/apache +RUN tar xf solr-5.5.0.tgz -C /opt/apache RUN rm -f zookeeper-*.tar.gz hadoop-*.tar.gz hbase-*.tar.gz solr-*.tgz RUN ln -s /opt/apache/zookeeper-* /opt/apache/zookeeper RUN ln -s /opt/apache/hadoop-* /opt/apache/hadoop http://git-wip-us.apache.org/repos/asf/chukwa/blob/d3834147/contrib/docker/start-all.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/start-all.sh b/contrib/docker/start-all.sh index 4cfe827..17701f5 100755 --- a/contrib/docker/start-all.sh +++ b/contrib/docker/start-all.sh @@ -21,7 +21,8 @@ export HBASE_CONF_DIR=/opt/apache/hbase/conf export CHUKWA_CONF_DIR=/opt/apache/chukwa/etc/chukwa service sshd start su - zookeeper -c '/opt/apache/zookeeper/bin/zkServer.sh start' -su - solr -c 'cd /opt/apache/solr/example; /usr/lib/jvm/jre/bin/java -Dbootstrap_confdir=/opt/apache/solr/example/solr/logs/conf -Dcollection.configName=myconf -Djetty.port=7574 -DzkHost=localhost:2181 -jar /opt/apache/solr/example/start.jar >/dev/null 2>&1 &' +su - solr -c 'cd /opt/apache/solr; ./bin/solr start -cloud -z localhost:2181 >/dev/null 2>&1 &' +su - solr -c 'cd /opt/apache/solr; ./bin/solr create_collection -c chukwa -n chukwa >/dev/null 2>&1 &' su - hdfs -c '/opt/apache/hadoop/sbin/start-dfs.sh >/dev/null 2>&1' su - yarn -c '/opt/apache/hadoop/sbin/start-yarn.sh >/dev/null 2>&1' SAFE_MODE=`su - hdfs -c '/opt/apache/hadoop/bin/hadoop dfsadmin -safemode get 2>/dev/null'`
