From 1c47434ec9b1f5e7607676746e74170db41cf467 Mon Sep 17 00:00:00 2001
From: Matteo Franci <mttfranci@gmail.com>
Date: Sat, 23 Mar 2024 23:09:37 +0100
Subject: [PATCH] base image ubuntu:22.04

---
 CHANGELOG.md  |  4 ++++
 Dockerfile    | 14 ++++++++++++--
 bin/setenv.sh |  9 +++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44d5862..42e0964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- base image ubuntu:22.04
+
 ## [1.0.0] - 2024-03-23
 
 ### Added
diff --git a/Dockerfile b/Dockerfile
index a1a49b6..2129297 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,12 +44,22 @@ RUN set -x \
     && cd ${BASE_DIR}/webapps/cmis \
     && unzip -qq /tmp/chemistry-opencmis-server-${CMIS_SERVER_TYPE}-${OPENCMIS_VERSION}.war -d .
 
+RUN set -x \
+    && cd /tmp \
+    && curl -LO https://corretto.aws/downloads/resources/8.402.08.1/amazon-corretto-8.402.08.1-linux-x64.tar.gz \
+    && mkdir ${BASE_DIR}/jdk-8 \
+    && cd ${BASE_DIR}/jdk-8
+
+RUN set -x \
+    && tar xf /tmp/amazon-corretto-8.402.08.1-linux-x64.tar.gz \
+    && mv /tmp/amazon-corretto-8.402.08.1-linux-x64/* ${BASE_DIR}/jdk-8
+
 COPY bin/setenv.sh ${BASE_DIR}/bin
 
 #####
 # Final stage 
 #####
-FROM exoplatform/jdk:8-ubuntu-1804
+FROM ubuntu:22.04
 
 # thanks to eXo Platform
 # https://github.com/exo-docker
@@ -86,5 +96,5 @@ VOLUME /data
 
 USER tomcat
 
-ENTRYPOINT ["/usr/local/bin/tini", "--"]
+#ENTRYPOINT ["/usr/local/bin/tini", "--"]
 CMD [ "/opt/cmis-server/bin/catalina.sh", "run" ]
diff --git a/bin/setenv.sh b/bin/setenv.sh
index 7f147e4..264f378 100644
--- a/bin/setenv.sh
+++ b/bin/setenv.sh
@@ -182,3 +182,12 @@ export CATALINA_OPTS="${CATALINA_OPTS:-} -Xmx${JVM_SIZE_MAX} -Xms${JVM_SIZE_MIN}
 echo "INFO Configuring cmis server..."
 cp -v /repository-template.properties ${INSTALL_DIR}/webapps/cmis/WEB-INF/classes/repository.properties
 replace_in_file ${INSTALL_DIR}/webapps/cmis/WEB-INF/classes/repository.properties "@CMIS_USERS_PASSWORD@" "${CMIS_USERS_PASSWORD}"
+
+export JAVA_HOME=${INSTALL_DIR}/jdk-8
+export PATH=${INSTALL_DIR}/bin:${PATH}
+
+echo "debug 1"
+ls -l ${INSTALL_DIR}
+
+echo "debug 2"
+ls -l ${INSTALL_DIR}/jdk-8
\ No newline at end of file