You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/06/06 01:55:07 UTC
hbase git commit: HBASE-18159 Use OpenJDK7 instead of Oracle JDK7 in
pre commit docker file
Repository: hbase
Updated Branches:
refs/heads/branch-1 3cf443326 -> 395d9a08e
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/395d9a08
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/395d9a08
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/395d9a08
Branch: refs/heads/branch-1
Commit: 395d9a08e3ef526736eb7eebdf4ab69d73ab8ad9
Parents: 3cf4433
Author: zhangduo <zh...@apache.org>
Authored: Mon Jun 5 20:42:03 2017 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Tue Jun 6 09:43:48 2017 +0800
----------------------------------------------------------------------
dev-support/docker/Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/395d9a08/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
####