From 232d16ccf669637d049499acbad1b65efc0d234f Mon Sep 17 00:00:00 2001 From: Swapnil Bawaskar Date: Fri, 2 Feb 2018 11:15:19 -0800 Subject: [PATCH] Update Dockerfile to: - use geode binary rather than building one on the fly - update to version 1.4.0 Updated Readme --- docker/Dockerfile | 18 ++++++++---------- docker/README.md | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 596597b63f71..5eca6f579610 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,21 +18,19 @@ FROM centos:7 MAINTAINER Apache Geode Community LABEL Vendor="Apache Geode" -LABEL version=1.3.0 +LABEL version=1.4.0 +ENV GEODE_VERSION 1.4.0 -RUN yum install -y wget which tar git java-1.8.0-openjdk-devel \ - && git clone https://github.com/apache/geode.git \ - && cd geode \ - && git checkout rel/v1.3.0 \ - && ./gradlew build -Dskip.tests=true -xjavadoc \ - && ls /geode | grep -v geode-assembly | xargs rm -rf \ - && rm -rf /root/.gradle/ \ - && rm -rf /geode/geode-assembly/build/distributions/ \ +RUN yum install -y wget which tar java-1.8.0-openjdk-devel \ + && wget https://dist.apache.org/repos/dist/release/geode/$GEODE_VERSION/apache-geode-$GEODE_VERSION.tgz \ + && tar -xvzf apache-geode-$GEODE_VERSION.tgz \ + && rm -rf apache-geode-$GEODE_VERSION.tgz \ + && cd apache-geode-$GEODE_VERSION \ && rm -rf /usr/share/locale/* \ && yum remove -y perl \ && yum clean all -ENV GEODE_HOME /geode/geode-assembly/build/install/apache-geode +ENV GEODE_HOME /apache-geode-$GEODE_VERSION ENV PATH $PATH:$GEODE_HOME/bin # Default ports: diff --git a/docker/README.md b/docker/README.md index a02f97a54b2a..9cda020c1362 100644 --- a/docker/README.md +++ b/docker/README.md @@ -16,7 +16,7 @@ docker build -t apachegeode/geode:latest . Once it's tagged, push to DockerHub: ``` -docker push apachegeode/geode:1.0.0-incubating +docker push apachegeode/geode:{version} ``` * You need to be authenticated in DockerHub and be an administrator of the project. Ask for permissions at *dev@geode.apache.org*. @@ -27,7 +27,7 @@ docker push apachegeode/geode:1.0.0-incubating 1. Execute the following command to run the container and start `gfsh`: ``` -docker run -it -p 10334:10334 -p 7575:7575 -p 1099:1099 apachegeode/geode:1.0.0-incubating +docker run -it -p 10334:10334 -p 7575:7575 -p 1099:1099 apachegeode/geode ``` From this point you can pretty much follow [Apache Geode in 5 minutes](https://cwiki.apache.org/confluence/display/GEODE/Index#Index-Geodein5minutes) for example: