Repository: hbase Updated Branches: refs/heads/master 9e688117b -> 4a7b43039
Revert "HBASE-19042 Oracle Java 8u144 downloader broken in precommit check" This reverts commit 9e688117bad3cb4826c7201bb359672676389620. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4a7b4303 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4a7b4303 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4a7b4303 Branch: refs/heads/master Commit: 4a7b4303979ffe9896811f633141681669e1c20d Parents: 9e68811 Author: zhangduo <zhang...@apache.org> Authored: Thu Oct 19 16:03:28 2017 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Thu Oct 19 16:03:28 2017 +0800 ---------------------------------------------------------------------- dev-support/docker/Dockerfile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4a7b4303/dev-support/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index c23c70d..62c6030 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -65,18 +65,18 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ zlib1g-dev ####### -# OpenJDK 8 +# Oracle Java ####### RUN echo "dot_style = mega" > "/root/.wgetrc" RUN echo "quiet = on" >> "/root/.wgetrc" RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common -RUN add-apt-repository -y ppa:openjdk-r/ppa -RUN apt-get -q update -RUN apt-get -q install --no-install-recommends -y openjdk-8-jdk -RUN update-alternatives --config java -RUN update-alternatives --config javac +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 @@ -131,16 +131,23 @@ 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-add-repository ppa:brightbox/ruby-ng -RUN apt-get -q update +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 --no-install-recommends -y ruby2.2 ruby-switch -RUN ruby-switch --set ruby2.2 #### # Install rubocop ### -RUN gem install rake RUN gem install rubocop ####
