From 4c8f67435e710990a059abca4803b9b6479eb881 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Thu, 19 Oct 2017 13:30:05 +0800 Subject: [PATCH] HBASE-19042 Oracle Java 8u144 downloader broken in precommit chec --- dev-support/docker/Dockerfile | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 62c6030..fbbea1f 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -19,7 +19,7 @@ # See BUILDING.txt. -FROM ubuntu:trusty +FROM ubuntu:xenial WORKDIR /root @@ -60,23 +60,17 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ python \ python2.7 \ python-pip \ + python-setuptools \ rsync \ snappy \ - zlib1g-dev - -####### -# Oracle Java -####### + zlib1g-dev \ + openjdk-8-jdk RUN echo "dot_style = mega" > "/root/.wgetrc" RUN echo "quiet = on" >> "/root/.wgetrc" +# For running add-apt-repository RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common -RUN add-apt-repository -y ppa:webupd8team/java - -# Auto-accept the Oracle JDK license -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 --no-install-recommends -y oracle-java8-installer #### # Apps that require Java @@ -120,6 +114,7 @@ RUN apt-get -q install --no-install-recommends -y bats #### # Install pylint #### +RUN pip install wheel RUN pip install pylint #### @@ -131,23 +126,13 @@ RUN pip install python-dateutil # Install Ruby 2, based on Yetus 0.4.0 dockerfile ### RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc -RUN apt-get -q install -y ruby2.0 -# -# on trusty, the above installs ruby2.0 and ruby (1.9.3) exes -# but update-alternatives is broken, so we need to do some work -# to make 2.0 actually the default without the system flipping out -# -# See https://bugs.launchpad.net/ubuntu/+source/ruby2.0/+bug/1310292 -# -RUN dpkg-divert --add --rename --divert /usr/bin/ruby.divert /usr/bin/ruby -RUN dpkg-divert --add --rename --divert /usr/bin/gem.divert /usr/bin/gemrc -RUN update-alternatives --install /usr/bin/ruby ruby /usr/bin/ruby2.0 1 -RUN update-alternatives --install /usr/bin/gem gem /usr/bin/gem2.0 1 +RUN apt-get -q install -y ruby2.3 #### # Install rubocop ### +RUN gem install rake RUN gem install rubocop #### -- 2.7.4