Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1E8DB200BE0 for ; Sat, 3 Dec 2016 06:45:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1D80B160B27; Sat, 3 Dec 2016 05:45:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 63910160AF6 for ; Sat, 3 Dec 2016 06:45:35 +0100 (CET) Received: (qmail 17034 invoked by uid 500); 3 Dec 2016 05:45:34 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 17024 invoked by uid 99); 3 Dec 2016 05:45:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2016 05:45:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C36E71AABFC for ; Sat, 3 Dec 2016 05:45:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id g1PSabhqpN9M for ; Sat, 3 Dec 2016 05:45:31 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 9CC265FC18 for ; Sat, 3 Dec 2016 05:45:30 +0000 (UTC) Received: (qmail 16991 invoked by uid 99); 3 Dec 2016 05:45:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2016 05:45:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A165DE0A77; Sat, 3 Dec 2016 05:45:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markito@apache.org To: commits@geode.incubator.apache.org Date: Sat, 03 Dec 2016 05:45:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-geode git commit: Using openjdk instead of Oracle archived-at: Sat, 03 Dec 2016 05:45:36 -0000 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 Authored: Mon Oct 31 11:28:31 2016 -0700 Committer: William Markito 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 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