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/fluo-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 5a5a47e Updates due to release of Fluo 1.2.0
5a5a47e is described below
commit 5a5a47e9a6db9de831f6966fb6e2c242afd56655
Author: Mike Walch <mwa...@apache.org>
AuthorDate: Tue Feb 27 13:57:33 2018 -0500
Updates due to release of Fluo 1.2.0
---
Dockerfile | 20 ++++++++++----------
README.md | 14 ++++----------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b17e39b..4fd8fda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,21 +18,22 @@ FROM openjdk:8
ARG HADOOP_VERSION
ARG ZOOKEEPER_VERSION
ARG ACCUMULO_VERSION
+ARG FLUO_VERSION
ARG HADOOP_HASH
ARG ZOOKEEPER_HASH
ARG ACCUMULO_HASH
+ARG FLUO_HASH
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 1.2.0-SNAPSHOT
+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}
-# Change and uncomment next line when 1.2.0 is released
-# ENV FLUO_HASH ${FLUO_HASH:-xxx}
+ENV FLUO_HASH ${FLUO_HASH:-a89cb7f76007e8fdd0860a4d5c4e1743d1a30459}
# Download from Apache mirrors instead of archive #9
ENV APACHE_DIST_URLS \
@@ -40,7 +41,7 @@ ENV APACHE_DIST_URLS \
# if the version is outdated (or we're grabbing the .asc file), we might have
to pull from the dist/archive :/
https://www-us.apache.org/dist/ \
https://www.apache.org/dist/ \
-https://archive.apache.org/dist/
+ https://archive.apache.org/dist/
RUN set -eux; \
download_bin() { \
@@ -60,16 +61,15 @@ RUN set -eux; \
[ -n "$success" ]; \
};\
\
- download_bin "accumulo.tar.gz" "$ACCUMULO_HASH"
"accumulo/$ACCUMULO_VERSION/accumulo-$ACCUMULO_VERSION-bin.tar.gz"; \
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 "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";
-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 line above and remove line below when 1.2.0 is released
-ADD ./fluo-$FLUO_VERSION-bin.tar.gz /tmp/
+RUN tar xzf accumulo.tar.gz -C /tmp/
+RUN tar xzf fluo.tar.gz -C /tmp/
RUN mv /tmp/hadoop-$HADOOP_VERSION /opt/hadoop
RUN mv /tmp/zookeeper-$ZOOKEEPER_VERSION /opt/zookeeper
diff --git a/README.md b/README.md
index 3b74116..31dea2f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Apache Fluo Docker Image
-**This is currently a work in progress that depends on unreleased features of
Fluo and will not be ready for use until after Fluo 1.2.0 is released.**
Sometime after Fluo 1.2.0 is released this project will make its first release.
Eventually, this will project will create a `apache/fluo` image at DockerHub.
Until then, you will need to build your own image.
+**This is currently a work in progress**. Eventually, this will project will
create a `apache/fluo` image at DockerHub. Until then, you will need to build
your own image.
This project creates the official [Apache Fluo][Fluo] docker image.
@@ -36,15 +36,7 @@ Below are instructions for building an image:
git clone g...@github.com:apache/fluo-docker.git
-2. Until Fluo 1.2 is released, build a Fluo tarball distribution and copy it
to the root
- directory of the repo.
-
- git clone g...@github.com:apache/fluo.git
- cd fluo/
- mvn clean package
- cp modules/distribution/target/fluo-1.2.0-SNAPSHOT-bin.tar.gz
/path/to/fluo-docker/
-
-3. Build the default Fluo docker image using the command below.
+2. Build the default Fluo docker image using the command below.
cd /path/to/fluo-docker
docker build -t fluo .
@@ -58,6 +50,8 @@ Below are instructions for building an image:
--build-arg ACCUMULO_HASH=8e6b4f5d9bd0c41ca9a206e876553d8b39923528 \
--build-arg HADOOP_VERSION=2.7.5 \
--build-arg HADOOP_HASH=0f90ef671530c2aa42cde6da111e8e47e9cd659e \
+ --build-arg FLUO_VERSION=1.2.0 \
+ --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.
--
To stop receiving notification emails like this one, please contact
ktur...@apache.org.
