You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ma...@apache.org on 2016/12/03 05:45:29 UTC
[1/3] incubator-geode git commit: Updating and cleaning up Dockerfile
for 1.0.0
Repository: incubator-geode
Updated Branches:
refs/heads/develop 7aae4be31 -> 00c46557e
Updating and cleaning up Dockerfile for 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b566a46e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b566a46e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b566a46e
Branch: refs/heads/develop
Commit: b566a46e8349612386c91c5d135636ac334218ad
Parents: 3ff33be
Author: William Markito <wm...@pivotal.io>
Authored: Thu Oct 27 23:11:39 2016 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Thu Oct 27 23:11:39 2016 -0700
----------------------------------------------------------------------
docker/Dockerfile | 26 +++++++++++------
docker/README.md | 56 ++++++++++---------------------------
docker/build-runtime-docker.sh | 32 ---------------------
3 files changed, 31 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b566a46e/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e68d5d4..e92e113 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,25 +14,34 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM geode/base:0.1
-MAINTAINER Geode Community <de...@geode.incubator.apache.org>
+FROM centos:7
+MAINTAINER Apache Geode Community <de...@geode.incubator.apache.org>
LABEL Vendor="Apache Geode (incubating)"
-LABEL version=unstable
+LABEL version=1.0.0
# download JDK 8
-# ENV JAVA_HOME /jdk1.8.0_51
+ENV JAVA_HOME /jdk1.8.0_111
-RUN git clone -b develop https://github.com/apache/incubator-geode.git \
+RUN yum install -y wget which tar git \
+ && wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u111-b14/jdk-8u111-linux-x64.tar.gz" \
+ && tar xf jdk-8u111-linux-x64.tar.gz \
+ && git clone https://github.com/apache/incubator-geode.git \
&& cd incubator-geode \
- && ./gradlew build -Dskip.tests=true \
+ && git checkout rel/v1.0.0-incubating \
+ && ./gradlew build -Dskip.tests=true -xjavadoc \
&& ls /incubator-geode | grep -v geode-assembly | xargs rm -rf \
&& rm -rf /root/.gradle/ \
&& rm -rf /incubator-geode/geode-assembly/build/distributions/ \
- && yum remove -y perl
+ && rm -rf /jdk-8u111-linux-x64.tar.gz \
+ && rm -rf /jdk1.8.0_111/lib/missioncontrol/* \
+ && rm -rf /jdk1.8.0_111/lib/visualvm/* \
+ && rm -rf /usr/share/locale/* \
+ && yum remove -y perl \
+ && yum clean all
ENV GEODE_HOME /incubator-geode/geode-assembly/build/install/apache-geode
-ENV PATH $PATH:$GEODE_HOME/bin
+ENV PATH $PATH:$GEODE_HOME/bin:$JAVA_HOME/bin
# Default ports:
# RMI/JMX 1099
@@ -43,4 +52,3 @@ ENV PATH $PATH:$GEODE_HOME/bin
EXPOSE 8080 10334 40404 1099 7070
VOLUME ["/data/"]
CMD ["gfsh"]
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b566a46e/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
index 2c1e31a..720f646 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -3,65 +3,37 @@
The current Dockerfile is based on a CentOS 7 image, downloads JDK 8, clone the Apache Geode git repository, starts a build and execute the basic tests.
```
-./build-runtime-docker.sh
+docker build .
```
-This may take a while depending on your internet connection, but it's worth since this is a one time step and you endup with a container that is tested and ready to be used for development. It will download Gradle and as part of the build, project dependencies as well.
-
-# Starting a locator and gfsh
-
-1. Then you can start gfsh as well in order to perform more commands:
-
-```
-docker run --rm=true -it -p 10334:10334 -p 7575:7575 -p 1099:1099 geode/runtime:0.1 gfsh
-```
-
-
-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:
+If you're updating the image for a release, tag the build with the version:
```
-start server --name=server1
+docker build -t apachegeode/geode:1.0.0-incubating .
```
-But in order to have real fun with containers you are probably better off using something like docker-compose or kubernetes. Those examples will come next.
-
-# Creating a cluster using multiple containers
-
-Install docker-compose following the instructions on this [link](https://docs.docker.com/compose/install/) and move into the composer directory.
-
-There is a docker-compose.yml example file there with a locator and a server. To start the cluster execute:
+Once it's tagged, push to DockerHub:
```
-docker-compose up
+docker push apachegeode/geode:1.0.0-incubating
```
-Or in order to start it in background:
+* You need to be authenticated in DockerHub and be an administrator of the project. Ask for permissions at *dev@geode.apache.org*.
+* This may take a while depending on your internet connection.
-```
-docker-compose up -d
-```
+# Starting a locator and gfsh
-Do a docker ps and identify the container ID for the locator. Now you can use *gfsh* on this container and connect to the distributed system:
+1. Execute the following command to run the container and start `gfsh`:
```
-docker exec -it <locator_container_id> gfsh
-gfsh>connect --locator=locator[10334]
-Connecting to Locator at [host=locator, port=10334] ..
-Connecting to Manager at [host=192.168.99.100, port=1099] ..
-Successfully connected to: [host=192.168.99.100, port=1099]
-
-gfsh>list members
- Name | Id
- ------------ | --------------------------------------
- locator | locator(locator:33:locator)<v0>:1351
- 6e96cc0f6b72 | 172.17.1.92(6e96cc0f6b72:34)<v1>:28140
+docker run -it -p 10334:10334 -p 7575:7575 -p 1099:1099 apache/geode:1.0.0-incubating
```
-Type exit and now to scale the cluster you can leverage docker-compose scale command. For example:
+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:
```
-docker-compose scale server=3
+gfsh> start locator --name=locator
+gfsh> start server --name=server
```
-This will start 2 extra Geode server containers. You can verify this step by repeating the last GFSH step and listing the members.
-
+But in order to have real fun with containers you are probably better off using something like docker-compose, Cloud foundry or Kubernetes. Those examples will come next.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b566a46e/docker/build-runtime-docker.sh
----------------------------------------------------------------------
diff --git a/docker/build-runtime-docker.sh b/docker/build-runtime-docker.sh
deleted file mode 100755
index 40fef67..0000000
--- a/docker/build-runtime-docker.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e -x -u
-
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-source ${SCRIPT_DIR}/../dev-tools/docker/base/build-base-docker.sh
-
-IMAGE_NAME="geode/runtime:${DOCKER_ENV_VERSION}"
-
-pushd ${SCRIPT_DIR}
-
-# Build runtime image
-docker build --rm=true -t ${IMAGE_NAME} .
-
-popd
-
[3/3] incubator-geode git commit: Merge branch 'feature/GEODE-1871'
into develop - Closes #275
Posted by ma...@apache.org.
Merge branch 'feature/GEODE-1871' into develop - Closes #275
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/00c46557
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/00c46557
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/00c46557
Branch: refs/heads/develop
Commit: 00c46557e9630afbb941a219a0a7e4973893517c
Parents: 7aae4be b37ab45
Author: William Markito Oliveira <ma...@padme.local>
Authored: Fri Dec 2 21:44:24 2016 -0800
Committer: William Markito Oliveira <ma...@padme.local>
Committed: Fri Dec 2 21:44:24 2016 -0800
----------------------------------------------------------------------
docker/Dockerfile | 20 ++++++-------
docker/README.md | 56 ++++++++++---------------------------
docker/build-runtime-docker.sh | 32 ---------------------
3 files changed, 24 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-geode git commit: Using openjdk instead of Oracle
Posted by ma...@apache.org.
Using openjdk instead of Oracle
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b37ab45a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b37ab45a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b37ab45a
Branch: refs/heads/develop
Commit: b37ab45af202d13992d2afe827d9d2ebee94e2af
Parents: b566a46
Author: William Markito <wm...@pivotal.io>
Authored: Mon Oct 31 11:28:31 2016 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Mon Oct 31 11:28:31 2016 -0700
----------------------------------------------------------------------
docker/Dockerfile | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b37ab45a/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e92e113..f2588b0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,12 +20,7 @@ MAINTAINER Apache Geode Community <de...@geode.incubator.apache.org>
LABEL Vendor="Apache Geode (incubating)"
LABEL version=1.0.0
-# download JDK 8
-ENV JAVA_HOME /jdk1.8.0_111
-
-RUN yum install -y wget which tar git \
- && wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/8u111-b14/jdk-8u111-linux-x64.tar.gz" \
- && tar xf jdk-8u111-linux-x64.tar.gz \
+RUN yum install -y wget which tar git java-1.8.0-openjdk-devel \
&& git clone https://github.com/apache/incubator-geode.git \
&& cd incubator-geode \
&& git checkout rel/v1.0.0-incubating \
@@ -33,15 +28,12 @@ RUN yum install -y wget which tar git \
&& ls /incubator-geode | grep -v geode-assembly | xargs rm -rf \
&& rm -rf /root/.gradle/ \
&& rm -rf /incubator-geode/geode-assembly/build/distributions/ \
- && rm -rf /jdk-8u111-linux-x64.tar.gz \
- && rm -rf /jdk1.8.0_111/lib/missioncontrol/* \
- && rm -rf /jdk1.8.0_111/lib/visualvm/* \
&& rm -rf /usr/share/locale/* \
&& yum remove -y perl \
&& yum clean all
ENV GEODE_HOME /incubator-geode/geode-assembly/build/install/apache-geode
-ENV PATH $PATH:$GEODE_HOME/bin:$JAVA_HOME/bin
+ENV PATH $PATH:$GEODE_HOME/bin
# Default ports:
# RMI/JMX 1099