From 87697e4d6b148cdf4d95e825b19ce7144cc75df1 Mon Sep 17 00:00:00 2001 From: Grisha Date: Tue, 29 Nov 2016 06:47:00 +0300 Subject: [PATCH] add Java into docker deps (#1405) --- scripts/docker/dependencies/Dockerfile | 12 +++++++++++- scripts/docker/dependencies/Dockerfile.xenial | 9 +++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/docker/dependencies/Dockerfile b/scripts/docker/dependencies/Dockerfile index 3ce12cb26c..f29f3735f7 100644 --- a/scripts/docker/dependencies/Dockerfile +++ b/scripts/docker/dependencies/Dockerfile @@ -4,7 +4,6 @@ MAINTAINER Howard Butler ENV CC gcc ENV CXX g++ - RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 16126D3A3E5C1192 RUN apt-get update -qq RUN apt-get -qq remove postgis @@ -297,5 +296,16 @@ RUN git clone https://github.com/ninja-build/ninja.git \ && ./configure.py --bootstrap \ && cp ninja /usr/bin +# Install Java. +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ + add-apt-repository -y ppa:webupd8team/java && \ + apt-get update && \ + apt-get install -y oracle-java8-installer && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/oracle-jdk8-installer + +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle + #RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 20 && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 20 + diff --git a/scripts/docker/dependencies/Dockerfile.xenial b/scripts/docker/dependencies/Dockerfile.xenial index 4e8d8abff6..09938dffba 100644 --- a/scripts/docker/dependencies/Dockerfile.xenial +++ b/scripts/docker/dependencies/Dockerfile.xenial @@ -269,5 +269,14 @@ RUN git clone https://github.com/gadomski/cpd.git \ && make install \ && rm -rf /cpd +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ + add-apt-repository -y ppa:webupd8team/java && \ + apt-get update && \ + apt-get install -y oracle-java8-installer && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/oracle-jdk8-installer + +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle + RUN apt-get clean