From cdc42d8f627d12fa4e8e9abd6a6b15b97f3e0d08 Mon Sep 17 00:00:00 2001
From: Artur <artur@tartigrado.com>
Date: Wed, 29 Oct 2025 14:38:13 -0300
Subject: [PATCH] feat: added AWS Corretto 25 to ubuntu 7.0 image

---
 ubuntu/standard/7.0/Dockerfile   |  6 +++++-
 ubuntu/standard/7.0/runtimes.yml | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ubuntu/standard/7.0/Dockerfile b/ubuntu/standard/7.0/Dockerfile
index ff53383..7895510 100644
--- a/ubuntu/standard/7.0/Dockerfile
+++ b/ubuntu/standard/7.0/Dockerfile
@@ -500,7 +500,10 @@ RUN goenv install $GOLANG_24_VERSION \
 #****************      END GOLANG     *******************************
 
 #****************      JAVA     ****************************************************
-ENV JAVA_21_HOME="/usr/lib/jvm/java-21-amazon-corretto" \
+ENV JAVA_25_HOME="/usr/lib/jvm/java-25-amazon-corretto" \
+    JDK_25_HOME="/usr/lib/jvm/java-25-amazon-corretto" \
+    JRE_25_HOME="/usr/lib/jvm/java-25-amazon-corretto" \
+    JAVA_21_HOME="/usr/lib/jvm/java-21-amazon-corretto" \
     JDK_21_HOME="/usr/lib/jvm/java-21-amazon-corretto" \
     JRE_21_HOME="/usr/lib/jvm/java-21-amazon-corretto" \
     JAVA_17_HOME="/usr/lib/jvm/java-17-amazon-corretto" \
@@ -537,6 +540,7 @@ RUN set -ex \
     && wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg \
     && echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | sudo tee /etc/apt/sources.list.d/corretto.list \
     && apt-get update \
+    && apt-get install -y -qq java-25-amazon-corretto-jdk \
     && apt-get install -y -qq java-21-amazon-corretto-jdk \
     && apt-get install -y -qq java-17-amazon-corretto-jdk \
     && apt-get install -y -qq java-11-amazon-corretto-jdk \
diff --git a/ubuntu/standard/7.0/runtimes.yml b/ubuntu/standard/7.0/runtimes.yml
index 25f02be..07866ba 100644
--- a/ubuntu/standard/7.0/runtimes.yml
+++ b/ubuntu/standard/7.0/runtimes.yml
@@ -3,6 +3,22 @@ version: 0.1
 runtimes:
   java:
     versions:
+      corretto25:
+        commands:
+          - echo "Installing Corretto(OpenJDK) version 25 ..."
+          - export JAVA_HOME="$JAVA_25_HOME"
+          - export JRE_HOME="$JRE_25_HOME"
+          - export JDK_HOME="$JDK_25_HOME"
+          - |-
+            for tool_path in "$JAVA_HOME"/bin/*;
+             do tool=`basename "$tool_path"`;
+              if [ $tool != 'java-rmi.cgi' ];
+              then
+                rm -f /usr/bin/$tool /var/lib/alternatives/$tool;
+                update-alternatives --install /usr/bin/$tool $tool $tool_path 20000;
+                update-alternatives --set $tool $tool_path;
+              fi;
+            done
       corretto21:
         commands:
           - echo "Installing Corretto(OpenJDK) version 21 ..."