From 9dac06abebfe2f9549ba4b2087abe1c3e7b0a946 Mon Sep 17 00:00:00 2001
From: Ariel Weisberg <aweisberg@fb.com>
Date: Wed, 24 Mar 2021 14:30:30 -0400
Subject: [PATCH 1/2] Use presto-oss to tag/commit on deploy

---
 .travis.yml                             |   8 ++------
 .travis/github_tags_push_deploy_key.enc | Bin 1680 -> 0 bytes
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 .travis/github_tags_push_deploy_key.enc

diff --git a/.travis.yml b/.travis.yml
index 5a089b2..cf9cc6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,8 @@ install: make ${IMAGE_TO_BUILD}
 script: make test IMAGE_TO_TEST=${IMAGE_TO_TEST}
 
 before_deploy:
-  # decrypt the github deploy key
-  - openssl aes-256-cbc -K $encrypted_cd2beb64619c_key -iv $encrypted_cd2beb64619c_iv
-    -in .travis/github_tags_push_deploy_key.enc -out .travis/github_tags_push_deploy_key -d
-  - chmod 600 .travis/github_tags_push_deploy_key
-  - eval "$(ssh-agent -s)"
-  - ssh-add .travis/github_tags_push_deploy_key
+  - git config --global user.email "presto-oss@users.noreply.github.com" && git config --global user.name "Presto Bot"
+  - echo "machine github.com login presto-oss password ${PRESTOOSS_PAT} > ~/.netrc
   - docker login --username=${DOCKERHUB_LOGIN} --password=${DOCKERHUB_PASSWORD}
 
 # Publish snapshots to Dockerhub for commits tagged `latest-snapshot-*`
diff --git a/.travis/github_tags_push_deploy_key.enc b/.travis/github_tags_push_deploy_key.enc
deleted file mode 100644
index e0b2379fa4d1cd64dcdd81f20c6117db0b8789ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1680
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
a;Q$V3Y@`c{QG&_M;T2X7KG{_IiR7p6nKZlr


From 19bf6b6e53259259f68e6b7cfec823f1bb63b4b5 Mon Sep 17 00:00:00 2001
From: Ariel Weisberg <aweisberg@fb.com>
Date: Wed, 24 Mar 2021 16:34:02 -0400
Subject: [PATCH 2/2] Fix Java 8 nonsense

---
 Makefile                              |  4 ++--
 prestodb/cdh5.12-hive/Dockerfile      |  2 +-
 prestodb/centos6-oj8/CentOS-Base.repo | 25 ++++++++++++++++++++
 prestodb/centos6-oj8/Dockerfile       | 33 ++++++++-------------------
 4 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 prestodb/centos6-oj8/CentOS-Base.repo

diff --git a/Makefile b/Makefile
index 51f550b..336e438 100644
--- a/Makefile
+++ b/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)
 
diff --git a/prestodb/cdh5.12-hive/Dockerfile b/prestodb/cdh5.12-hive/Dockerfile
index 2a76cc3..cbb7d00 100644
--- a/prestodb/cdh5.12-hive/Dockerfile
+++ b/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
 
diff --git a/prestodb/centos6-oj8/CentOS-Base.repo b/prestodb/centos6-oj8/CentOS-Base.repo
new file mode 100644
index 0000000..17157f2
--- /dev/null
+++ b/prestodb/centos6-oj8/CentOS-Base.repo
@@ -0,0 +1,25 @@
+[base]
+name=CentOS-$releasever - Base
+# mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
+# baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+baseurl=https://vault.centos.org/6.10/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+# released updates
+[updates]
+name=CentOS-$releasever - Updates
+# mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
+# baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
+baseurl=https://vault.centos.org/6.10/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+# additional packages that may be useful
+[extras]
+name=CentOS-$releasever - Extras
+# mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
+# baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
+baseurl=https://vault.centos.org/6.10/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
diff --git a/prestodb/centos6-oj8/Dockerfile b/prestodb/centos6-oj8/Dockerfile
index 4ad95d1..19e2d26 100644
--- a/prestodb/centos6-oj8/Dockerfile
+++ b/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 && \