Fix Java 8 nonsense

Author: aweisberg

Makefile

@@ -32,8 +32,8 @@ ORGDIR=prestodb
 # indirectly from this one, and you should pass those variables to the
 # Dockerfiles using ARG and --build-arg.
 #
-JDK_URL := http://download.oracle.com/otn-pub/java/jdk/8u181-b13/96a7b8442fe848ef90c96a2fad6ed6d1/jdk-8u181-linux-x64.rpm
-JDK_PATH := /usr/java/jdk1.8.0_181-amd64
+JDK_URL := https://cdn.azul.com/zulu/bin/zulu8.52.0.23-ca-jdk8.0.282-linux_x64.tar.gz
+JDK_PATH := /usr/java/zulu8.52.0.23-ca-jdk8.0.282-linux_x64
 JDK_PATH_BUILD_ARGS := \
 	--build-arg JDK_PATH=$(JDK_PATH)
 

prestodb/cdh5.12-hive/Dockerfile

@@ -17,7 +17,7 @@ MAINTAINER Presto community <https://prestodb.io/community.html>
 RUN ln -snf "/usr/share/zoneinfo/Asia/Kathmandu" /etc/localtime && echo "Asia/Kathmandu" > /etc/timezone
 
 # Setup CDH repo, pin the CDH distribution to a concrete version
-RUN wget -nv https://archive.cloudera.com/cdh5/redhat/6/x86_64/cdh/cloudera-cdh5.repo -P /etc/yum.repos.d \
+RUN wget -v https://archive.cloudera.com/cdh5/redhat/6/x86_64/cdh/cloudera-cdh5.repo -P /etc/yum.repos.d \
   && rpm --import https://archive.cloudera.com/cdh5/redhat/6/x86_64/cdh/RPM-GPG-KEY-cloudera \
   && sed -i '/^baseurl=/c\baseurl=https://archive.cloudera.com/cdh5/redhat/6/x86_64/cdh/5.12.2/' /etc/yum.repos.d/cloudera-cdh5.repo
 

prestodb/centos6-oj8/Dockerfile

@@ -16,36 +16,21 @@ MAINTAINER Presto community <https://prestodb.io/community.html>
 ARG JDK_URL
 ARG JDK_PATH
 
+COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
+
 # Install Oracle Java and presto-admin dependences (already has python 2.6)
 RUN \
     set -xeu && \
     yum install -y wget && \
     # install and trim Oracle JDK
-    wget -nv --header "Cookie: oraclelicense=accept-securebackup-cookie" $JDK_URL -O jdk.rpm && \
-    rpm -ivh jdk.rpm && rm jdk.rpm && \
-    rm -r $JDK_PATH/*src.zip \
-           $JDK_PATH/lib/missioncontrol \
-           $JDK_PATH/lib/visualvm \
-           $JDK_PATH/lib/*javafx* \
-           $JDK_PATH/jre/lib/plugin.jar \
-           $JDK_PATH/jre/lib/ext/jfxrt.jar \
-           $JDK_PATH/jre/bin/javaws \
-           $JDK_PATH/jre/lib/javaws.jar \
-           $JDK_PATH/jre/lib/desktop \
-           $JDK_PATH/jre/plugin \
-           $JDK_PATH/jre/lib/deploy* \
-           $JDK_PATH/jre/lib/*javafx* \
-           $JDK_PATH/jre/lib/*jfx* \
-           $JDK_PATH/jre/lib/amd64/libdecora_sse.so \
-           $JDK_PATH/jre/lib/amd64/libprism_*.so \
-           $JDK_PATH/jre/lib/amd64/libfxplugins.so \
-           $JDK_PATH/jre/lib/amd64/libglass.so \
-           $JDK_PATH/jre/lib/amd64/libgstreamer-lite.so \
-           $JDK_PATH/jre/lib/amd64/libjavafx*.so \
-           $JDK_PATH/jre/lib/amd64/libjfx*.so && \
-    \
+    wget -nv $JDK_URL -O jdk.tgz && \
+    mkdir -p $JDK_PATH && \
+    tar xvfz jdk.tgz -C $JDK_PATH --strip-components=1 && \
+    $JDK_PATH/bin/java -version && \
     # make java fixed (so further layers don't accidentally override it)
-    update-alternatives --set java $JDK_PATH/jre/bin/java && \
+    update-alternatives --help && \
+    alternatives --help && \
+    update-alternatives --install /usr/local/bin/java java $JDK_PATH/jre/bin/java 0 && \
     \
     # install supervisor
     yum install -y setuptools epel-release && \