hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject hbase git commit: HBASE-19055 Backport HBASE-19042 to other active branches
Date Fri, 20 Oct 2017 02:45:14 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 b4cf88b76 -> 7175cfdf8


HBASE-19055 Backport HBASE-19042 to other active branches


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7175cfdf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7175cfdf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7175cfdf

Branch: refs/heads/branch-1.2
Commit: 7175cfdf86e29f669a553d5d368d21c2ce7d28a1
Parents: b4cf88b
Author: zhangduo <zhangduo@apache.org>
Authored: Fri Oct 20 09:09:06 2017 +0800
Committer: zhangduo <zhangduo@apache.org>
Committed: Fri Oct 20 10:41:35 2017 +0800

----------------------------------------------------------------------
 dev-support/docker/Dockerfile | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/7175cfdf/dev-support/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 9515418..eee78e2 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -66,18 +66,18 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends
-y \
     openjdk-7-jdk
 
 #######
-# Oracle Java
+# OpenJDK 8
 #######
 
 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: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
+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
 
 ####
 # Apps that require Java
@@ -132,23 +132,16 @@ 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-add-repository ppa:brightbox/ruby-ng
+RUN apt-get -q update
 
+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
 
 ####


Mime
View raw message