From 9d91ffd039fadbf17c17486bdba3f3aa6fb3d15f Mon Sep 17 00:00:00 2001 From: Jonathan Wei Date: Wed, 18 Oct 2017 07:33:27 -0700 Subject: [PATCH] Use ubuntu image with pre-installed java 8 for IT docker (#4970) * Use OpenJDK8 instead of Oracle for IT docker * install wget * Use different docker image * Revert "Use different docker image" This reverts commit 5786c03cb49d0ac60a4f06690e483c3284fe4564. * Revert "install wget" This reverts commit 8d1d5ec681301f2919b9d994e65e4d436f948a72. * Revert "Use OpenJDK8 instead of Oracle for IT docker" This reverts commit 55ea163bb530b1e88c2cccd647f89d75ac90393a. * Use prebuilt java8 image * Add comment on docker image --- integration-tests/docker/Dockerfile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 1d98753b00e..6174ce07f1e 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,15 +1,8 @@ -FROM ubuntu:14.04 - -# Java 8 -RUN apt-get update \ - && apt-get install -y software-properties-common \ - && apt-add-repository -y ppa:webupd8team/java \ - && apt-get purge --auto-remove -y software-properties-common \ - && apt-get update \ - && echo oracle-java-8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections \ - && apt-get install -y oracle-java8-installer \ - && apt-get install -y oracle-java8-set-default \ - && rm -rf /var/cache/oracle-jdk8-installer +# This is intended to be a temporary unblocker for Travis CI +# We should revert this when ppa:webupd8team/java repo maintainers fix the issue shown here: https://github.com/druid-io/druid/pull/4970 +# Or if we stick to using a non-base Ubuntu image, the custom image should reside in an org repo and not an individual repo +# https://hub.docker.com/r/jonweiimply/ubuntu-j8/ +FROM jonweiimply/ubuntu-j8 # MySQL (Metadata store) RUN apt-get install -y mysql-server