From 76da44b137259b97377ec6a1caac866fad2a6758 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Mon, 5 Jun 2017 20:42:03 +0800 Subject: [PATCH] HBASE-18159 Use OpenJDK7 instead of Oracle JDK7 in pre commit docker file --- dev-support/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 #### -- 2.7.4