From 55ea163bb530b1e88c2cccd647f89d75ac90393a Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 14:24:16 -0700 Subject: [PATCH 1/8] Use OpenJDK8 instead of Oracle for IT docker --- integration-tests/docker/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 1d98753b00e0..d1b884ac630e 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -3,13 +3,10 @@ FROM ubuntu:14.04 # Java 8 RUN apt-get update \ && apt-get install -y software-properties-common \ - && apt-add-repository -y ppa:webupd8team/java \ + && add-apt-repository -y ppa:openjdk-r/ppa \ && 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 + && apt-get install -y openjdk-8-jdk # MySQL (Metadata store) RUN apt-get install -y mysql-server From 8d1d5ec681301f2919b9d994e65e4d436f948a72 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 16:04:25 -0700 Subject: [PATCH 2/8] install wget --- integration-tests/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index d1b884ac630e..4284775b8405 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -8,6 +8,9 @@ RUN apt-get update \ && apt-get update \ && apt-get install -y openjdk-8-jdk +# wget +RUN apt-get install -y wget + # MySQL (Metadata store) RUN apt-get install -y mysql-server From 5786c03cb49d0ac60a4f06690e483c3284fe4564 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 18:54:41 -0700 Subject: [PATCH 3/8] Use different docker image --- integration-tests/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 4284775b8405..27891556c91e 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,12 +1,11 @@ -FROM ubuntu:14.04 +FROM openjdk:8u141-jdk # Java 8 RUN apt-get update \ && apt-get install -y software-properties-common \ && add-apt-repository -y ppa:openjdk-r/ppa \ && apt-get purge --auto-remove -y software-properties-common \ - && apt-get update \ - && apt-get install -y openjdk-8-jdk + && apt-get update # wget RUN apt-get install -y wget From a0e061c3b4d75f223cc04f88514091dbb203fc80 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 19:07:44 -0700 Subject: [PATCH 4/8] Revert "Use different docker image" This reverts commit 5786c03cb49d0ac60a4f06690e483c3284fe4564. --- integration-tests/docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 27891556c91e..4284775b8405 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,11 +1,12 @@ -FROM openjdk:8u141-jdk +FROM ubuntu:14.04 # Java 8 RUN apt-get update \ && apt-get install -y software-properties-common \ && add-apt-repository -y ppa:openjdk-r/ppa \ && apt-get purge --auto-remove -y software-properties-common \ - && apt-get update + && apt-get update \ + && apt-get install -y openjdk-8-jdk # wget RUN apt-get install -y wget From 303759a30cf85f7a3746ab4ba5db7599ad8c4c87 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 22:29:56 -0700 Subject: [PATCH 5/8] Revert "install wget" This reverts commit 8d1d5ec681301f2919b9d994e65e4d436f948a72. --- integration-tests/docker/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 4284775b8405..d1b884ac630e 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -8,9 +8,6 @@ RUN apt-get update \ && apt-get update \ && apt-get install -y openjdk-8-jdk -# wget -RUN apt-get install -y wget - # MySQL (Metadata store) RUN apt-get install -y mysql-server From 576b47841dba3673ae1ae6c51fd3d051bbf4f490 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 22:30:04 -0700 Subject: [PATCH 6/8] Revert "Use OpenJDK8 instead of Oracle for IT docker" This reverts commit 55ea163bb530b1e88c2cccd647f89d75ac90393a. --- integration-tests/docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index d1b884ac630e..1d98753b00e0 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -3,10 +3,13 @@ FROM ubuntu:14.04 # Java 8 RUN apt-get update \ && apt-get install -y software-properties-common \ - && add-apt-repository -y ppa:openjdk-r/ppa \ + && apt-add-repository -y ppa:webupd8team/java \ && apt-get purge --auto-remove -y software-properties-common \ && apt-get update \ - && apt-get install -y openjdk-8-jdk + && 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 # MySQL (Metadata store) RUN apt-get install -y mysql-server From 1a3396d21b3cc60e001b9523e944f6c25b484477 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 22:31:03 -0700 Subject: [PATCH 7/8] Use prebuilt java8 image --- integration-tests/docker/Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 1d98753b00e0..c66af00292e4 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,15 +1,4 @@ -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 +FROM jonweiimply/ubuntu-j8 # MySQL (Metadata store) RUN apt-get install -y mysql-server From 08af899e7fe6e780ff10d9d9976048cd1a261876 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 17 Oct 2017 23:38:54 -0700 Subject: [PATCH 8/8] Add comment on docker image --- integration-tests/docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index c66af00292e4..6174ce07f1e7 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -1,3 +1,7 @@ +# 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)