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: Dockerfile & README updates (#9)
Date Tue, 19 Mar 2019 20:23:13 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 aa2a60c  Dockerfile & README updates (#9)
aa2a60c is described below

commit aa2a60cacb052fb8e763dcb76a511e97f1228b6e
Author: Mike Walch <mwalch@apache.org>
AuthorDate: Tue Mar 19 16:23:09 2019 -0400

    Dockerfile & README updates (#9)
---
 Dockerfile | 16 +++++++++++++---
 README.md  |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 551046a..0350ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,8 @@ ARG HADOOP_VERSION=3.1.1
 ARG ZOOKEEPER_VERSION=3.4.13
 ARG HADOOP_USER_NAME=accumulo
 ARG ACCUMULO_FILE=
+ARG HADOOP_FILE=
+ARG ZOOKEEPER_FILE=
 
 ENV HADOOP_USER_NAME $HADOOP_USER_NAME
 
@@ -33,7 +35,7 @@ ENV APACHE_DIST_URLS \
   https://www.apache.org/dist/ \
   https://archive.apache.org/dist/
 
-COPY README.md $ACCUMULO_FILE /tmp/
+COPY README.md $ACCUMULO_FILE $HADOOP_FILE $ZOOKEEPER_FILE /tmp/
 
 RUN set -eux; \
   download() { \
@@ -50,8 +52,16 @@ RUN set -eux; \
     [ -n "$success" ]; \
   }; \
   \
-  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";
\
+  if [ -z "$HADOOP_FILE" ]; then \
+    download "hadoop.tar.gz" "hadoop/core/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz";
\
+  else \
+    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";
\
+  else \
+    cp "/tmp/$ZOOKEEPER_FILE" "zookeeper.tar.gz"; \
+  fi; \
   if [ -z "$ACCUMULO_FILE" ]; then \
     download "accumulo.tar.gz" "accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz";
\
   else \
diff --git a/README.md b/README.md
index 9d34287..2a5a117 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@
 **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.
-Until then, you will need to build your own image.
+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.
 
 ## Obtain the Docker image
 


Mime
View raw message