IT: Switch to OpenJDK8 base image. (#5060)

* IT: Switch to OpenJDK8 base image.

Also split the Docker image into a base image and a child image, and
build the base image ahead of time for efficiency's sake. Also upgrade
ZK to 3.4.10.

* Additional comments about ZK upgrades.

docs/content/tutorials/cluster.md

@@ -291,9 +291,9 @@ rsync -az druid-#{DRUIDVERSION}/ COORDINATION_SERVER:druid-#{DRUIDVERSION}/
 Log on to your coordination server and install Zookeeper:
 
 ```bash
-curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.9/zookeeper-3.4.9.tar.gz -o zookeeper-3.4.9.tar.gz
+curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz -o zookeeper-3.4.10.tar.gz
-tar -xzf zookeeper-3.4.9.tar.gz
+tar -xzf zookeeper-3.4.10.tar.gz
-cd zookeeper-3.4.9
+cd zookeeper-3.4.10
 cp conf/zoo_sample.cfg conf/zoo.cfg
 ./bin/zkServer.sh start
 ```

docs/content/tutorials/quickstart.md

@@ -50,9 +50,9 @@ Druid currently has a dependency on [Apache ZooKeeper](http://zookeeper.apache.o
 need to download and run Zookeeper.
 
 ```bash
-curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz -o zookeeper-3.4.6.tar.gz
+curl http://www.gtlib.gatech.edu/pub/apache/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz -o zookeeper-3.4.10.tar.gz
-tar -xzf zookeeper-3.4.6.tar.gz
+tar -xzf zookeeper-3.4.10.tar.gz
-cd zookeeper-3.4.6
+cd zookeeper-3.4.10
 cp conf/zoo_sample.cfg conf/zoo.cfg
 ./bin/zkServer.sh start
 ```

integration-tests/docker-base/Dockerfile

@@ -0,0 +1,7 @@
+FROM ubuntu:16.04
+
+# Bundle everything into one script so cleanup can reduce image size.
+# Otherwise docker's layered images mean that things are not actually deleted.
+
+COPY setup.sh /root/setup.sh
+RUN chmod 0755 /root/setup.sh && /root/setup.sh

integration-tests/docker-base/setup.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+set -u
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+
+# wget
+apt-get install -y wget
+
+# Java
+apt-get install -y openjdk-8-jdk
+
+# MySQL (Metadata store)
+apt-get install -y mysql-server
+
+# Supervisor
+apt-get install -y supervisor
+
+# Zookeeper
+wget -q -O - http://www.us.apache.org/dist/zookeeper/zookeeper-3.4.10/zookeeper-3.4.10.tar.gz | tar -xzf - -C /usr/local \
+  && cp /usr/local/zookeeper-3.4.10/conf/zoo_sample.cfg /usr/local/zookeeper-3.4.10/conf/zoo.cfg \
+  && ln -s /usr/local/zookeeper-3.4.10 /usr/local/zookeeper
+
+# Kafka
+# Match the version to the Kafka client used by KafkaSupervisor
+wget -q -O - http://www.us.apache.org/dist/kafka/0.10.2.0/kafka_2.11-0.10.2.0.tgz | tar -xzf - -C /usr/local \
+ && ln -s /usr/local/kafka_2.11-0.10.2.0 /usr/local/kafka
+
+# Druid system user
+adduser --system --group --no-create-home druid \
+  && mkdir -p /var/lib/druid \
+  && chown druid:druid /var/lib/druid
+
+# clean up time
+apt-get clean \
+  && rm -rf /tmp/* \
+            /var/tmp/* \
+            /var/lib/apt/lists \
+            /root/.m2

integration-tests/docker/Dockerfile

@@ -1,37 +1,5 @@
-# This is intended to be a temporary unblocker for Travis CI
+# Base image is built from integration-tests/docker-base in the Druid repo
-# We should revert this when ppa:webupd8team/java repo maintainers fix the issue shown here: https://github.com/druid-io/druid/pull/4970
+FROM imply/druiditbase
-# 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
-
-# Supervisor
-RUN apt-get install -y supervisor
-
-# Zookeeper
-RUN wget -q -O - http://www.us.apache.org/dist/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz | tar -xzf - -C /usr/local \
-      && cp /usr/local/zookeeper-3.4.6/conf/zoo_sample.cfg /usr/local/zookeeper-3.4.6/conf/zoo.cfg \
-      && ln -s /usr/local/zookeeper-3.4.6 /usr/local/zookeeper
-
-# Kafka
-# Match the version to the Kafka client used by KafkaSupervisor
-RUN wget -q -O - http://www.us.apache.org/dist/kafka/0.10.2.0/kafka_2.11-0.10.2.0.tgz | tar -xzf - -C /usr/local \
-      && ln -s /usr/local/kafka_2.11-0.10.2.0 /usr/local/kafka
-
-# Druid system user
-RUN adduser --system --group --no-create-home druid \
-      && mkdir -p /var/lib/druid \
-      && chown druid:druid /var/lib/druid
-
-# clean up time
-RUN apt-get clean \
-      && rm -rf /tmp/* \
-                /var/tmp/* \
-                /var/lib/apt/lists \
-                /root/.m2
-
 
 # Setup metadata store
 RUN /etc/init.d/mysql start \

pom.xml

@@ -80,6 +80,9 @@
         Need to update Druid to use Jackson 2.6+ -->
         <aws.sdk.version>1.10.77</aws.sdk.version>
         <caffeine.version>2.5.5</caffeine.version>
+
+        <!-- When upgrading ZK, edit docs and integration tests as well (integration-tests/docker-base/setup.sh) -->
+        <zookeeper.version>3.4.10</zookeeper.version>
     </properties>
 
     <modules>
@@ -250,7 +253,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.4.10</version>
+                <version>${zookeeper.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>