From 19408ea253e8b65a90d071c1ca2d4f0f763d67a3 Mon Sep 17 00:00:00 2001
From: Georgi Ivanov <givanov@expediagroup.com>
Date: Mon, 10 Feb 2025 10:13:03 +0000
Subject: [PATCH] WIP

---
 Dockerfile                                   |  8 +++-----
 files/emr-apps.repo                          | 10 +++++-----
 files/emr-platform.repo                      |  6 +++---
 files/emr-puppet.repo                        |  4 ++--
 files/{RPM-GPG-KEY-emr => repoPublicKey.txt} |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)
 rename files/{RPM-GPG-KEY-emr => repoPublicKey.txt} (97%)

diff --git a/Dockerfile b/Dockerfile
index fc76f93..20bad01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 Expedia Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 
-from amazonlinux:2
+FROM amazoncorretto:8
 
 ENV RANGER_VERSION 2.0.0
 ENV APIARY_EXTENSIONS_VERSION 8.0.2
@@ -15,16 +15,14 @@ ENV GETHOSTNAME4J_VERSION 0.0.3
 ENV JNA_VERSION 3.0.9
 ENV EXPORTER_VERSION 0.12.0
 
-COPY files/RPM-GPG-KEY-emr /etc/pki/rpm-gpg/RPM-GPG-KEY-emr
+COPY files/repoPublicKey.txt /var/aws/emr/repoPublicKey.txt
 COPY files/emr-apps.repo /etc/yum.repos.d/emr-apps.repo
 COPY files/emr-platform.repo /etc/yum.repos.d/emr-platform.repo
 COPY files/emr-puppet.repo /etc/yum.repos.d/emr-puppet.repo
 
 RUN yum -y install shadow-utils && \
     useradd -r hadoop
-RUN yum -y install java-1.8.0-openjdk \
-  java-1.8.0-openjdk-devel.x86_64 \
-  hive-metastore \
+RUN yum -y install hive-metastore \
   mariadb-connector-java \
   mysql-connector-java \
   mysql \
diff --git a/files/emr-apps.repo b/files/emr-apps.repo
index ac14b45..af23842 100644
--- a/files/emr-apps.repo
+++ b/files/emr-apps.repo
@@ -1,7 +1,7 @@
-[emr-applications]
-name = EMR Applications Repository
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-emr
+[emr-apps]
+name = EMR Application Repository
+gpgkey = file:///var/aws/emr/repoPublicKey.txt
 enabled = 1
-baseurl = https://s3.amazonaws.com/repo.us-east-1.emr.amazonaws.com/apps-repository/emr-5.36.2/800a23aa-8170-401d-b799-73caed213b0d
+baseurl = https://s3.amazonaws.com/repo.us-east-1.emr.amazonaws.com/apps-repository/emr-6.15.0/2e521865-7958-4dca-ace5-e0bce38925f1
 priority = 5
-gpgcheck = 1
+gpgcheck = 1
\ No newline at end of file
diff --git a/files/emr-platform.repo b/files/emr-platform.repo
index 449cc7c..467557e 100644
--- a/files/emr-platform.repo
+++ b/files/emr-platform.repo
@@ -1,7 +1,7 @@
 [emr-platform]
 name = EMR Platform Repository
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-emr
+gpgkey = file:///var/aws/emr/repoPublicKey.txt
 enabled = 1
-baseurl = https://s3.amazonaws.com/repo.us-east-1.emr.amazonaws.com/platform-repository/1.30.2/e35a2136-da13-4653-a19c-858dd5b29e72
+baseurl = https://s3.amazonaws.com/repo.us-east-1.emr.amazonaws.com/platform-repository/2.17.0/7d648907-33bf-4dc6-9693-50b688cb0959
 priority = 5
-gpgcheck = 1
+gpgcheck = 1
\ No newline at end of file
diff --git a/files/emr-puppet.repo b/files/emr-puppet.repo
index c3e06d8..a93a43a 100644
--- a/files/emr-puppet.repo
+++ b/files/emr-puppet.repo
@@ -1,9 +1,9 @@
 [emr-puppet]
 name = Amazon Extras repo for emr-puppet
 report_instanceid = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-emr
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2
 enabled = 1
 skip_if_unavailable = 1
 priority = 10
-mirrorlist = http://amazonlinux.$awsregion.$awsdomain/$releasever/extras/emr-puppet/latest/$basearch/mirror.list
+mirrorlist = https://amazonlinux-2-repos-us-east-1.s3.dualstack.us-east-1.amazonaws.com/2/extras/emr-puppet/latest/x86_64/mirror.list
 gpgcheck = 1
\ No newline at end of file
diff --git a/files/RPM-GPG-KEY-emr b/files/repoPublicKey.txt
similarity index 97%
rename from files/RPM-GPG-KEY-emr
rename to files/repoPublicKey.txt
index ce4836b..99e4038 100644
--- a/files/RPM-GPG-KEY-emr
+++ b/files/repoPublicKey.txt
@@ -27,4 +27,4 @@ ZJYc/360UsBcCxf2WawV/WzNmQ02Iy14Bfd/VYkrLWqDqhDExUlftDf5V4YG7LL/
 /0eZwxwOpHJjuQ5NYoT4HNHxCKy70W5s7n8+AWRLrbTIrDRdegglDSeJ0M4zAA9W
 ZcKnv216VkD9YtctmZcZRr/C/maBdRjqRDGdHrV4E6pPnT2M459HBsc=
 =h7Pp
------END PGP PUBLIC KEY BLOCK-----
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file