Repository: hbase Updated Branches: refs/heads/branch-1.1 b9b01f75f -> 70789c733
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/70789c73 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/70789c73 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/70789c73 Branch: refs/heads/branch-1.1 Commit: 70789c733f1ce721b68d52fcbaa1079967dc02ed Parents: b9b01f7 Author: zhangduo <[email protected]> Authored: Mon Jun 5 20:42:03 2017 +0800 Committer: zhangduo <[email protected]> Committed: Tue Jun 6 09:46:32 2017 +0800 ---------------------------------------------------------------------- dev-support/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/70789c73/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 ####
