Repository: chukwa Updated Branches: refs/heads/master cf722856c -> e0ff0ea8b
CHUKWA-814. Update HBase and Solr support for Docker demo. (Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/chukwa/repo Commit: http://git-wip-us.apache.org/repos/asf/chukwa/commit/e0ff0ea8 Tree: http://git-wip-us.apache.org/repos/asf/chukwa/tree/e0ff0ea8 Diff: http://git-wip-us.apache.org/repos/asf/chukwa/diff/e0ff0ea8 Branch: refs/heads/master Commit: e0ff0ea8b6237549624f2ddc2f82c088223f8ef0 Parents: cf72285 Author: Eric Yang <[email protected]> Authored: Sun Nov 20 18:19:49 2016 -0800 Committer: Eric Yang <[email protected]> Committed: Sun Nov 20 18:19:49 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + contrib/docker/Dockerfile | 10 +++++----- contrib/docker/hadoop/hadoop-env.sh | 2 +- contrib/docker/hadoop/yarn-env.sh | 2 +- contrib/docker/setup-image.sh | 4 +++- contrib/docker/start-all.sh | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/chukwa/blob/e0ff0ea8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1da65a9..8b3059d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ Trunk (unreleased changes) NEW FEATURES IMPROVEMENTS + CHUKWA-814. Update HBase and Solr support for Docker demo. (Eric Yang) BUGS http://git-wip-us.apache.org/repos/asf/chukwa/blob/e0ff0ea8/contrib/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index ab77fe0..0afad77 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -14,17 +14,17 @@ # limitations under the License. FROM centos:6 MAINTAINER Apache -RUN yum install -y tar wget bind-utils ntpd java-1.7.0-openjdk which openssh-server openssh-clients +RUN yum install -y tar wget bind-utils ntpd java-1.7.0-openjdk which openssh-server openssh-clients lsof 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.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 +RUN wget https://www.apache.org/dist/hbase/1.2.4/hbase-1.2.4-bin.tar.gz +RUN wget https://www.apache.org/dist/lucene/solr/5.5.3/solr-5.5.3.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.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 tar xf hbase-1.2.4-bin.tar.gz -C /opt/apache +RUN tar xf solr-5.5.3.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/e0ff0ea8/contrib/docker/hadoop/hadoop-env.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/hadoop/hadoop-env.sh b/contrib/docker/hadoop/hadoop-env.sh index 593a5f7..a6db0d5 100644 --- a/contrib/docker/hadoop/hadoop-env.sh +++ b/contrib/docker/hadoop/hadoop-env.sh @@ -24,7 +24,7 @@ # The java implementation to use. export JAVA_HOME=/usr/lib/jvm/jre -export HADOOP_LOG_DIR=/var/log/hadoop +export HADOOP_LOG_DIR=/var/log/hadoop/hdfs export HADOOP_PID_DIR=/var/run/hadoop # The jsvc implementation to use. Jsvc is required to run secure datanodes http://git-wip-us.apache.org/repos/asf/chukwa/blob/e0ff0ea8/contrib/docker/hadoop/yarn-env.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/hadoop/yarn-env.sh b/contrib/docker/hadoop/yarn-env.sh index d4da29a..cf51fb7 100644 --- a/contrib/docker/hadoop/yarn-env.sh +++ b/contrib/docker/hadoop/yarn-env.sh @@ -19,7 +19,7 @@ export HADOOP_YARN_USER=${HADOOP_YARN_USER:-yarn} # resolve links - $0 may be a softlink export YARN_CONF_DIR="${YARN_CONF_DIR:-$HADOOP_YARN_HOME/conf}" -export YARN_LOG_DIR=/var/log/hadoop +export YARN_LOG_DIR=/var/log/hadoop/yarn # some Java parameters export JAVA_HOME=/usr/lib/jvm/jre http://git-wip-us.apache.org/repos/asf/chukwa/blob/e0ff0ea8/contrib/docker/setup-image.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/setup-image.sh b/contrib/docker/setup-image.sh index 021468d..fcaffcc 100755 --- a/contrib/docker/setup-image.sh +++ b/contrib/docker/setup-image.sh @@ -88,13 +88,15 @@ mkdir -p /var/run/hbase mkdir -p /var/run/chukwa mkdir -p /var/run/solr mkdir -p /var/log/hadoop +mkdir -p /var/log/hadoop/hdfs +mkdir -p /var/log/hadoop/yarn mkdir -p /var/log/hbase mkdir -p /var/log/chukwa chown -R zookeeper:hadoop /opt/apache/zookeeper* /var/lib/zookeeper chmod 775 /var/run/hadoop -chmod 775 /var/log/hadoop chown -R hdfs:hadoop /opt/apache/hadoop* /var/lib/hdfs /var/run/hadoop /var/log/hadoop +chown -R yarn:hadoop /var/log/hadoop/yarn chown -R hbase:hadoop /opt/apache/hbase* /var/run/hbase /var/log/hbase chown -R solr:hadoop /opt/apache/solr* /var/run/solr chown -R chukwa:hadoop /opt/apache/chukwa* /var/lib/chukwa /var/run/chukwa /var/log/chukwa http://git-wip-us.apache.org/repos/asf/chukwa/blob/e0ff0ea8/contrib/docker/start-all.sh ---------------------------------------------------------------------- diff --git a/contrib/docker/start-all.sh b/contrib/docker/start-all.sh index 7f0fd7b..d1a397f 100755 --- a/contrib/docker/start-all.sh +++ b/contrib/docker/start-all.sh @@ -34,7 +34,7 @@ su - hbase -c '/opt/apache/hbase/bin/start-hbase.sh >/dev/null 2>&1' su - chukwa -c '/opt/apache/chukwa/sbin/start-chukwa.sh' echo echo "Chukwa Docker container is ready." -echo "Use web browser to visit http://`hostname -f`:4080/ for demo." +echo "Use web browser to visit port 4080 for demo." echo "Username: admin, password: admin" echo echo "Enjoy!"
