[GitHub] keith-turner closed pull request #15: Updated versions and made using snapshot easy

[GitBox <gi...@apache.org>]

keith-turner closed pull request #15: Updated versions and made using snapshot easy
URL: https://github.com/apache/fluo-docker/pull/15
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/Dockerfile b/Dockerfile
index 4fd8fda..9b56005 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,25 +15,17 @@
 
 FROM openjdk:8
 
-ARG HADOOP_VERSION
-ARG ZOOKEEPER_VERSION
-ARG ACCUMULO_VERSION
-ARG FLUO_VERSION
+ARG HADOOP_VERSION=2.8.5
+ARG ZOOKEEPER_VERSION=3.4.13
+ARG ACCUMULO_VERSION=1.9.2
+ARG FLUO_VERSION=1.2.0
 
-ARG HADOOP_HASH
-ARG ZOOKEEPER_HASH
-ARG ACCUMULO_HASH
-ARG FLUO_HASH
+ARG HADOOP_HASH=fc1037ce9a601ea01d35ff2aa28625863b3809c3
+ARG ZOOKEEPER_HASH=a989b527f3f990d471e6d47ee410e57d8be7620b
+ARG ACCUMULO_HASH=744e523e4b8321fea34771bb4bd74dbef819cba7
+ARG FLUO_HASH=a89cb7f76007e8fdd0860a4d5c4e1743d1a30459
 
-ENV HADOOP_VERSION ${HADOOP_VERSION:-2.7.5}
-ENV ZOOKEEPER_VERSION ${ZOOKEEPER_VERSION:-3.4.11}
-ENV ACCUMULO_VERSION ${ACCUMULO_VERSION:-1.8.1}
-ENV FLUO_VERSION ${FLUO_VERSION:-1.2.0}
-
-ENV HADOOP_HASH ${HADOOP_HASH:-0f90ef671530c2aa42cde6da111e8e47e9cd659e}
-ENV ZOOKEEPER_HASH ${ZOOKEEPER_HASH:-9268b4aed71dccad3d7da5bfa5573b66d2c9b565}
-ENV ACCUMULO_HASH ${ACCUMULO_HASH:-8e6b4f5d9bd0c41ca9a206e876553d8b39923528}
-ENV FLUO_HASH ${FLUO_HASH:-a89cb7f76007e8fdd0860a4d5c4e1743d1a30459}
+ARG FLUO_FILE=
 
 # Download from Apache mirrors instead of archive #9
 ENV APACHE_DIST_URLS \
@@ -43,6 +35,8 @@ ENV APACHE_DIST_URLS \
   https://www.apache.org/dist/ \
   https://archive.apache.org/dist/
 
+COPY README.md $FLUO_FILE /tmp/
+
 RUN set -eux; \
   download_bin() { \
     local f="$1"; shift; \
@@ -64,8 +58,11 @@ RUN set -eux; \
    download_bin "hadoop.tar.gz" "$HADOOP_HASH" "hadoop/core/hadoop-$HADOOP_VERSION/hadoop-$HADOOP_VERSION.tar.gz"; \
    download_bin "zookeeper.tar.gz" "$ZOOKEEPER_HASH" "zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz"; \
    download_bin "accumulo.tar.gz" "$ACCUMULO_HASH" "accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz"; \
-   download_bin "fluo.tar.gz" "$FLUO_HASH" "fluo/fluo/$FLUO_VERSION/fluo-$FLUO_VERSION-bin.tar.gz";
-
+   if [ -z "$FLUO_FILE" ]; then \
+     download_bin "fluo.tar.gz" "$FLUO_HASH" "fluo/fluo/$FLUO_VERSION/fluo-$FLUO_VERSION-bin.tar.gz"; \
+   else \
+     cp "/tmp/$FLUO_FILE" "fluo.tar.gz"; \
+   fi
 RUN tar xzf hadoop.tar.gz -C /tmp/
 RUN tar xzf zookeeper.tar.gz -C /tmp/
 RUN tar xzf accumulo.tar.gz -C /tmp/
@@ -77,6 +74,7 @@ RUN mv /tmp/accumulo-$ACCUMULO_VERSION /opt/accumulo
 RUN mv /tmp/fluo-$FLUO_VERSION /opt/fluo
 
 ENV HADOOP_PREFIX /opt/hadoop
+ENV HADOOP_HOME /opt/hadoop
 ENV ZOOKEEPER_HOME /opt/zookeeper
 ENV ACCUMULO_HOME /opt/accumulo
 ENV FLUO_HOME /opt/fluo
diff --git a/README.md b/README.md
index cacbf21..7059d0d 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,16 @@ To obtain the docker image created by this project, you can either pull it from
 
     docker pull apache/fluo
 
-While it is easier to pull from DockerHub, the image will default to the software versions below:
+While it is easier to pull from DockerHub, it may not have the versions of
+Hadoop, Zookeeper, and Accumulo you are using.  The Dockerfile has the software
+versions below:
 
 | Software    | Version |
 |-------------|---------|
 | [Fluo]      | 1.2.0   |
-| [Accumulo]  | 1.8.1   |
-| [Hadoop]    | 2.7.5   |
-| [Zookeeper] | 3.4.11  |
+| [Accumulo]  | 1.9.2   |
+| [Hadoop]    | 2.8.5   |
+| [Zookeeper] | 3.4.13  |
 
 If these versions do not match what is running on your cluster, you should consider building
 your own image with matching versions. However, Fluo must be 1.2+.
@@ -52,7 +54,8 @@ Below are instructions for building an image:
         --build-arg FLUO_HASH=a89cb7f76007e8fdd0860a4d5c4e1743d1a30459 \
         -t fluo .
 
-   Don't forget to update the HASH of the chosen version. We use SHA1 to validate the hash.
+   Don't forget to update the HASH of the chosen version. We use SHA1 to validate the hash. If you need to
+   test an unreleased version of Fluo, then use the `FLUO_FILE` build argument instead of `FLUO_HASH`.
 
 ## Next steps
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services