From 0507c91d36ad5b7d08fd723c4a6831c19f52a7de Mon Sep 17 00:00:00 2001
From: Hussein Awala <hussein@awala.fr>
Date: Sat, 30 Nov 2024 02:15:58 +0100
Subject: [PATCH] chore(spark-history): update spark-history image to jdk 17
 and spark 3.5.3 (#105)

---
 docker/spark-history.Dockerfile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/docker/spark-history.Dockerfile b/docker/spark-history.Dockerfile
index e9c62ab..2182961 100644
--- a/docker/spark-history.Dockerfile
+++ b/docker/spark-history.Dockerfile
@@ -1,8 +1,10 @@
-ARG JAVA_VERSION=11
-FROM openjdk:${JAVA_VERSION}-jdk AS dependencies
+ARG JAVA_VERSION=17
+FROM amazoncorretto:${JAVA_VERSION} AS dependencies
+
+RUN yum install -y curl
 
 ARG IVY_VERSION=2.5.2
-RUN wget -O ivy.jar http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/${IVY_VERSION}/ivy-${IVY_VERSION}.jar
+RUN curl -L -o ivy.jar "http://search.maven.org/remotecontent?filepath=org/apache/ivy/ivy/${IVY_VERSION}/ivy-${IVY_VERSION}.jar"
 
 ARG STORAGE_BACKEND=local
 ARG HADOOP_VERSION=3.3.4
@@ -13,10 +15,12 @@ RUN /generate-dependencies.sh ${STORAGE_BACKEND}
 RUN java -jar ivy.jar -ivy ivy.xml -retrieve "lib/[artifact]-[revision](-[classifier]).[ext]"
 
 
-FROM openjdk:${JAVA_VERSION}-jdk
+FROM amazoncorretto:${JAVA_VERSION}
+
+RUN yum install -y curl procps tar
 
-ARG SPARK_VERSION=3.5.1
-RUN wget -qO- https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz | tar xz -C /opt \
+ARG SPARK_VERSION=3.5.3
+RUN curl -sL "https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz" | tar xz -C /opt \
     && ln -s /opt/spark-${SPARK_VERSION}-bin-hadoop3 /opt/spark
 
 COPY --from=dependencies /lib /opt/spark/jars
@@ -26,7 +30,7 @@ ENV PATH=$PATH:$SPARK_HOME/bin
 ENV SPARK_NO_DAEMONIZE=false
 ENV SPARK_CONF_DIR=$SPARK_HOME/conf
 
-RUN adduser --disabled-password --gecos '' --uid 1000 spark
+RUN useradd -m -u 1000 -s /usr/sbin/nologin spark
 USER spark
 
 CMD ["/opt/spark/sbin/start-history-server.sh"]