Bump corretto version 17->21

jetbrains-infra · Jan 15, 2024 · 45360a3 · 45360a3
1 parent 0e05ff1
commit 45360a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM amazoncorretto:17.0.5
+FROM amazoncorretto:21.0.1
 
 LABEL maintainer="Sergey Zhukov <sergey@jetbrains.com>" \
     maintainer="Sergey Kondrashov <sergey.kondrashov@jetbrains.com>"
 
 
-ENV WRAPPER_VER 3.5.51
+ENV WRAPPER_VER 3.5.54
 ENV WRAPPER_URL http://wrapper.tanukisoftware.com/download/${WRAPPER_VER}/wrapper-linux-x86-64-${WRAPPER_VER}.tar.gz
 
 ADD wrapper.sed /
@@ -26,7 +26,7 @@ RUN mkdir -p /home/javaapp/standalone/{bin,conf,lib,logs,temp} /root/prerun; \
     rm wrapper-linux-x86-64-${WRAPPER_VER}.tar.gz
 
 # Adding cacerts file from current Java disto to "conf" directory of Tomcat
-RUN cp /usr/lib/jvm/java-17-amazon-corretto/lib/security/cacerts /home/javaapp/standalone/conf/truststore
+RUN cp /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts /home/javaapp/standalone/conf/truststore
 ADD onbuild /home/javaapp/onbuild/
 ADD apply.sh /
 

diff --git a/onbuild/cacerts/1-apply.sh b/onbuild/cacerts/1-apply.sh
@@ -6,6 +6,6 @@
 for cafile in `ls *.pem`
 do
   caalias=`echo ${cafile} |  sed s/\.[^\.]*$//`
-  /usr/lib/jvm/java-17-amazon-corretto/bin/keytool -import -file /home/javaapp/onbuild/cacerts/$cafile -alias $caalias -keystore $1 -storepass changeit -noprompt -trustcacerts
+  /usr/lib/jvm/java-21-amazon-corretto/bin/keytool -import -file /home/javaapp/onbuild/cacerts/$cafile -alias $caalias -keystore $1 -storepass changeit -noprompt -trustcacerts
   rm ${cafile}
 done
diff --git a/wrapper.sed b/wrapper.sed
@@ -4,7 +4,7 @@ s/@app.long.name@/javaapp/g
 
 /^APP_LONG_NAME="javaapp"/ a\
 \
-export JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto\
+export JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto\
 export CATALINA_HOME=/home/javaapp/standalone\
 export CATALINA_BASE=$CATALINA_HOME\
 export TMP_DIR=$CATALINA_HOME/temp