Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13161. remove JDK7 from Dockerfile (aw)

This commit is contained in:
Allen Wittenauer 2016-05-16 20:25:40 -07:00
parent 61f46be071
commit 2c91fd8241
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dev-support/docker/Dockerfile
View File

@ -28,9 +28,11 @@ ENV DEBCONF_TERSE true
###### ######
# Install common dependencies from packages # 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 \ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
ant \
build-essential \ build-essential \
bzip2 \ bzip2 \
cmake \ cmake \
@ -42,17 +44,14 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
git \ git \
gnupg-agent \ gnupg-agent \
make \ make \
maven \
libbz2-dev \ libbz2-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libfuse-dev \ libfuse-dev \
libjansson-dev \
libprotobuf-dev \ libprotobuf-dev \
libprotoc-dev \ libprotoc-dev \
libsnappy-dev \ libsnappy-dev \
libssl-dev \ libssl-dev \
libtool \ libtool \
openjdk-7-jdk \
pinentry-curses \ pinentry-curses \
pkg-config \ pkg-config \
protobuf-compiler \ protobuf-compiler \
@ -63,10 +62,6 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
snappy \ snappy \
zlib1g-dev 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 # Install ISA-L library
###### ######
@ -86,14 +81,21 @@ RUN apt-get -q install --no-install-recommends -y software-properties-common
RUN add-apt-repository -y ppa:webupd8team/java RUN add-apt-repository -y ppa:webupd8team/java
RUN apt-get -q update 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 # 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 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 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 # Install findbugs
###### ######