Repository: hadoop Updated Branches: refs/heads/trunk 61f46be07 -> 2c91fd824
HADOOP-13161. remove JDK7 from Dockerfile (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2c91fd82 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2c91fd82 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2c91fd82 Branch: refs/heads/trunk Commit: 2c91fd82415a7b0fcdf91952bda98bea669f1646 Parents: 61f46be Author: Allen Wittenauer <a...@apache.org> Authored: Mon May 16 20:25:40 2016 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Mon May 16 20:25:40 2016 -0700 ---------------------------------------------------------------------- dev-support/docker/Dockerfile | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2c91fd82/dev-support/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index eba7df7..f9bf5aa 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -28,9 +28,11 @@ ENV DEBCONF_TERSE true ###### # Install common dependencies from packages +# +# WARNING: DO NOT PUT JAVA APPS HERE! Otherwise they will install default +# Ubuntu Java. See Java section below! ###### RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ - ant \ build-essential \ bzip2 \ cmake \ @@ -42,17 +44,14 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ git \ gnupg-agent \ make \ - maven \ libbz2-dev \ libcurl4-openssl-dev \ libfuse-dev \ - libjansson-dev \ libprotobuf-dev \ libprotoc-dev \ libsnappy-dev \ libssl-dev \ libtool \ - openjdk-7-jdk \ pinentry-curses \ pkg-config \ protobuf-compiler \ @@ -63,10 +62,6 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ snappy \ zlib1g-dev -# Fixing the Apache commons / Maven dependency problem under Ubuntu: -# See http://wiki.apache.org/commons/VfsProblems -RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar . - ###### # Install ISA-L library ###### @@ -87,13 +82,20 @@ RUN add-apt-repository -y ppa:webupd8team/java RUN apt-get -q update # 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 apt-get -q install --no-install-recommends -y oracle-java7-installer - -# 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 install --no-install-recommends -y oracle-java8-installer +#### +# Apps that require Java +### +RUN apt-get -q update && apt-get -q install --no-install-recommends -y \ + ant \ + maven + +# Fixing the Apache commons / Maven dependency problem under Ubuntu: +# See http://wiki.apache.org/commons/VfsProblems +RUN cd /usr/share/maven/lib && ln -s ../../java/commons-lang.jar . + ###### # Install findbugs ###### --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
