accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [accumulo-docker] branch master updated: Updates to work with Accumulo 2.0.0-alpha-1 (#6)
Date Wed, 31 Oct 2018 15:36:52 GMT
This is an automated email from the ASF dual-hosted git repository.

mwalch 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 3e980a6  Updates to work with Accumulo 2.0.0-alpha-1 (#6)
3e980a6 is described below

commit 3e980a62af2033066257d330d6abd02b421bfe76
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Wed Oct 31 11:36:47 2018 -0400

    Updates to work with Accumulo 2.0.0-alpha-1 (#6)
---
 Dockerfile |  9 +++------
 README.md  | 20 ++++++--------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8066d56..98bba83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ ARG ZOOKEEPER_VERSION
 ENV HADOOP_VERSION ${HADOOP_VERSION:-3.1.1}
 ENV HADOOP_USER_NAME ${HADOOP_USER_NAME:-accumulo}
 ENV ZOOKEEPER_VERSION ${ZOOKEEPER_VERSION:-3.4.13}
-ENV ACCUMULO_VERSION 2.0.0-SNAPSHOT
+ENV ACCUMULO_VERSION 2.0.0-alpha-1
 
 ENV APACHE_DIST_URLS \
   https://www.apache.org/dyn/closer.cgi?action=download&filename= \
@@ -49,17 +49,14 @@ RUN set -eux; \
     [ -n "$success" ]; \
   }; \
   \
-  #download "accumulo.tar.gz" "accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz"
\
+  download "accumulo.tar.gz" "accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz";
\
   download "hadoop.tar.gz" "hadoop/core/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz";
\
   download "zookeeper.tar.gz" "zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz"
 
-#RUN tar xzf accumulo.tar.gz -C /tmp/
+RUN tar xzf accumulo.tar.gz -C /tmp/
 RUN tar xzf hadoop.tar.gz -C /tmp/
 RUN tar xzf zookeeper.tar.gz -C /tmp/
 
-# Comment out accumulo-related lines above and remove line below when 2.0.0 is released
-ADD ./accumulo-$ACCUMULO_VERSION-bin.tar.gz /tmp/
-
 RUN mv /tmp/hadoop-$HADOOP_VERSION /opt/hadoop
 RUN mv /tmp/zookeeper-$ZOOKEEPER_VERSION /opt/zookeeper
 RUN mv /tmp/accumulo-$ACCUMULO_VERSION /opt/accumulo
diff --git a/README.md b/README.md
index 28bc23f..bdd67aa 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,11 @@ To obtain the docker image created by this project, you can either pull
it from
 
 While it is easier to pull from DockerHub, the image will default to the software versions
below:
 
-| Software    | Version        |
-|-------------|----------------|
-| [Accumulo]  | 2.0.0-SNAPSHOT |
-| [Hadoop]    | 2.7.4          |
-| [Zookeeper] | 3.4.9          |
+| Software    | Version       |
+|-------------|---------------|
+| [Accumulo]  | 2.0.0-alpha-1 |
+| [Hadoop]    | 2.7.4         |
+| [Zookeeper] | 3.4.9         |
 
 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
@@ -28,15 +28,7 @@ building an image:
 
         git clone git@github.com:apache/accumulo-docker.git
 
-2. Until Accumulo 2.0.0 is released, build a Accumulo tarball distribution and copy it to
the root
-   directory of the repo.
-
-        git clone git@github.com:apache/accumulo.git
-        cd accumulo/
-        mvn clean package
-        cp assemble/target/accumulo-2.0.0-SNAPSHOT-bin.tar.gz /path/to/accumulo-docker/
-
-3. Build the default Accumulo docker image using the command below.
+2. Build the default Accumulo docker image using the command below.
 
         cd /path/to/accumulo-docker
         docker build -t accumulo .


Mime
View raw message