hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject hbase git commit: HBASE-18159 Use OpenJDK7 instead of Oracle JDK7 in pre commit docker file
Date Tue, 06 Jun 2017 01:56:09 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 afbbfb447 -> 2fc26cc24


HBASE-18159 Use OpenJDK7 instead of Oracle JDK7 in pre commit docker file


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2fc26cc2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2fc26cc2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2fc26cc2

Branch: refs/heads/branch-1.2
Commit: 2fc26cc24cd46c86cdee5b68a3205e05eab1d89b
Parents: afbbfb4
Author: zhangduo <zhangduo@apache.org>
Authored: Mon Jun 5 20:42:03 2017 +0800
Committer: zhangduo <zhangduo@apache.org>
Committed: Tue Jun 6 09:46:19 2017 +0800

----------------------------------------------------------------------
 dev-support/docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2fc26cc2/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 35bf927..e83600f 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -61,7 +61,8 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends
-y \
     python-pip \
     rsync \
     snappy \
-    zlib1g-dev
+    zlib1g-dev \
+    openjdk-7-jdk
 
 #######
 # Oracle Java
@@ -74,9 +75,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends
-y software-
 RUN add-apt-repository -y ppa:webupd8team/java
 
 # Auto-accept the Oracle JDK license
-RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
 RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
-RUN apt-get -q update && apt-get -q install -y oracle-java7-installer
 RUN apt-get -q update && apt-get -q install --no-install-recommends -y oracle-java8-installer
 
 ####


Mime
View raw message