This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-docker.git
The following commit(s) were added to refs/heads/master by this push: new df153dc Update Accumulo version in Dockerfile & README.md (#12) df153dc is described below commit df153dc00af462831809ea4cbfd360de2bce7be7 Author: Karthick Narendran <karthick.narend...@gmail.com> AuthorDate: Thu Apr 9 17:45:44 2020 +0100 Update Accumulo version in Dockerfile & README.md (#12) --- Dockerfile | 15 +++++++++------ README.md | 12 +++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0350ae0..6102757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,9 @@ FROM centos:7 RUN yum install -y java-1.8.0-openjdk-devel make gcc-c++ wget ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk -ARG ACCUMULO_VERSION=2.0.0-alpha-1 -ARG HADOOP_VERSION=3.1.1 -ARG ZOOKEEPER_VERSION=3.4.13 +ARG ACCUMULO_VERSION=2.0.0 +ARG HADOOP_VERSION=3.2.1 +ARG ZOOKEEPER_VERSION=3.6.0 ARG HADOOP_USER_NAME=accumulo ARG ACCUMULO_FILE= ARG HADOOP_FILE= @@ -58,9 +58,9 @@ RUN set -eux; \ cp "/tmp/$HADOOP_FILE" "hadoop.tar.gz"; \ fi; \ if [ -z "$ZOOKEEPER_FILE" ]; then \ - download "zookeeper.tar.gz" "zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz"; \ + download "zookeeper.tar.gz" "zookeeper/zookeeper-$ZOOKEEPER_VERSION/apache-zookeeper-$ZOOKEEPER_VERSION-bin.tar.gz"; \ else \ - cp "/tmp/$ZOOKEEPER_FILE" "zookeeper.tar.gz"; \ + cp "/tmp/$ZOOKEEPER_FILE" "apache-zookeeper.tar.gz"; \ fi; \ if [ -z "$ACCUMULO_FILE" ]; then \ download "accumulo.tar.gz" "accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz"; \ @@ -73,11 +73,14 @@ RUN tar xzf hadoop.tar.gz -C /tmp/ RUN tar xzf zookeeper.tar.gz -C /tmp/ RUN mv /tmp/hadoop-$HADOOP_VERSION /opt/hadoop -RUN mv /tmp/zookeeper-$ZOOKEEPER_VERSION /opt/zookeeper +RUN mv /tmp/apache-zookeeper-$ZOOKEEPER_VERSION-bin /opt/zookeeper RUN mv /tmp/accumulo-$ACCUMULO_VERSION /opt/accumulo RUN /opt/accumulo/bin/accumulo-util build-native +# The below line is required for Accumulo 2.0 to work with ZK 3.5 & above. This will not be needed for Accumulo 2.1 +RUN sed -i 's/\${ZOOKEEPER_HOME}\/\*/\${ZOOKEEPER_HOME}\/\*\:\${ZOOKEEPER_HOME}\/lib\/\*/g' /opt/accumulo/conf/accumulo-env.sh + ADD ./accumulo.properties /opt/accumulo/conf ADD ./log4j-service.properties /opt/accumulo/conf ADD ./log4j-monitor.properties /opt/accumulo/conf diff --git a/README.md b/README.md index 2a5a117..811ee38 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Apache Accumulo Docker Image -**This is currently a work in progress that depends on unreleased features of Accumulo and will not be ready -for use until after Accumulo 2.0.0 is released.** Sometime after Accumulo 2.0.0 is released this project -will make its first release. Eventually, this will project will create a `apache/accumulo` image at DockerHub. +This is the first release of this project. Eventually, this project will create an `apache/accumulo` image at DockerHub. Until then, you will need to build your own image. The master branch of this repo creates a Docker image for Accumulo 2.0+. If you want to create a Docker image for Accumulo 1.9, there is a [1.9 branch](https://github.com/apache/accumulo-docker/tree/1.9) for that. @@ -18,9 +16,9 @@ While it is easier to pull from DockerHub, the image will default to the softwar | Software | Version | |-------------|---------------| -| [Accumulo] | 2.0.0-alpha-1 | -| [Hadoop] | 3.1.1 | -| [Zookeeper] | 3.4.13 | +| [Accumulo] | 2.0.0 | +| [Hadoop] | 3.2.1 | +| [ZooKeeper] | 3.6.0 | If these versions do not match what is running on your cluster, you should consider building your own image with matching versions. However, Accumulo must be 2.0.0+. Below are instructions for @@ -140,4 +138,4 @@ of tablet servers that you want to run. [Accumulo]: https://accumulo.apache.org/ [Hadoop]: https://hadoop.apache.org/ -[Zookeeper]: https://zookeeper.apache.org/ +[ZooKeeper]: https://zookeeper.apache.org/