upgrade to Java 21

Author: Ubuntu

Dockerfile

@@ -6,16 +6,16 @@ RUN yum -y update \
     zlib-devel glibc-static libcxx libcxx-devel llvm-toolset-7 zlib-static \
     && rm -rf /var/cache/yum
 
-ENV JDK_FOLDERNAME jdk-17
-ENV JDK_FILENAME openjdk-17_linux-x64_bin.tar.gz
-RUN curl -4 -L https://download.java.net/java/GA/jdk17/0d483333a00540d886896bac774ff48b/35/GPL/${JDK_FILENAME} | tar -xvz
-RUN mv $JDK_FOLDERNAME /usr/lib/jdk17
+ENV JDK_FOLDERNAME jdk-21
+ENV JDK_FILENAME openjdk-21_linux-x64_bin.tar.gz
+RUN curl -4 -L https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.tar.gz | tar -xvz
+RUN mv $JDK_FOLDERNAME /usr/lib/jdk21
 RUN yum install -y binutils
 RUN rm -rf $JDK_FOLDERNAME
-ENV PATH="/usr/lib/jdk17/bin:$PATH"
-RUN jlink --add-modules "$(java --list-modules | cut -f1 -d'@' | tr '\n' ',')" --compress 0 --no-man-pages --no-header-files --strip-debug --output /opt/jre17-slim
-RUN find /opt/jre17-slim/lib -name *.so -exec strip -p --strip-unneeded {} \;
+ENV PATH="/usr/lib/jdk21/bin:$PATH"
+RUN jlink --add-modules "$(java --list-modules | cut -f1 -d'@' | tr '\n' ',')" --compress 0 --no-man-pages --no-header-files --strip-debug --output /opt/jre21-slim
+RUN find /opt/jre21-slim/lib -name *.so -exec strip -p --strip-unneeded {} \;
 RUN java -Xshare:dump -version
-RUN rm /opt/jre17-slim/lib/classlist
-RUN cp /usr/lib/jdk17/lib/server/classes.jsa /opt/jre17-slim/lib/server/classes.jsa
-RUN cd /opt/ && zip -r jre-17-slim.zip jre17-slim
+RUN rm /opt/jre21-slim/lib/classlist
+RUN cp /usr/lib/jdk21/lib/server/classes.jsa /opt/jre21-slim/lib/server/classes.jsa
+RUN cd /opt/ && zip -r jre-21-slim.zip jre21-slim

bootstrap

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-/opt/jre17-slim/bin/java --add-opens java.base/java.util=ALL-UNNAMED -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xshare:on -cp "/opt/aws-lambda-java-runtime-interface-client-1.1.0.jar:/opt/aws-lambda-java-core-1.2.1.jar:/opt/aws-lambda-java-serialization-1.0.0.jar:$LAMBDA_TASK_ROOT:$LAMBDA_TASK_ROOT/*:$LAMBDA_TASK_ROOT/lib/*" com.amazonaws.services.lambda.runtime.api.client.AWSLambda "$_HANDLER"
+# Should we use -Xshare:on? @msailes did originally...
+# -Xlog:cds is important for solving the CDS problem.
+/opt/jre21-slim/bin/java --add-opens java.base/java.util=ALL-UNNAMED -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xshare:auto -cp "/opt/aws-lambda-java-runtime-interface-client-2.4.1.jar:/opt/aws-lambda-java-core-1.2.3.jar:/opt/aws-lambda-java-serialization-1.1.2.jar:$LAMBDA_TASK_ROOT:$LAMBDA_TASK_ROOT/*:$LAMBDA_TASK_ROOT/lib/*" com.amazonaws.services.lambda.runtime.api.client.AWSLambda "$_HANDLER"

build-jre.sh

@@ -1,2 +1,2 @@
-docker build --progress=plain -t jre17-al2-slim .
-docker run -v $(pwd)/layer:/tmp -it jre17-al2-slim sh -c "cp /opt/jre-17-slim.zip /tmp"
+docker build -t jre21-al2-slim .
+docker run -v $(pwd)/layer:/tmp -it jre21-al2-slim sh -c "cp /opt/jre-21-slim.zip /tmp"

make-layer.sh

@@ -3,8 +3,20 @@
 # -4 IPv4 only
 # -L follow redirect if the server responds with a redirect
 mkdir layer
-curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-runtime-interface-client/1.1.0/aws-lambda-java-runtime-interface-client-1.1.0.jar -o layer/aws-lambda-java-runtime-interface-client-1.1.0.jar
-curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-core/1.2.1/aws-lambda-java-core-1.2.1.jar -o layer/aws-lambda-java-core-1.2.1.jar
-curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-serialization/1.0.0/aws-lambda-java-serialization-1.0.0.jar -o layer/aws-lambda-java-serialization-1.0.0.jar
+curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-runtime-interface-client/2.4.1/aws-lambda-java-runtime-interface-client-2.4.1.jar -o layer/aws-lambda-java-runtime-interface-client-2.4.1.jar
+curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-core/1.2.3/aws-lambda-java-core-1.2.3.jar -o layer/aws-lambda-java-core-1.2.3.jar
+curl -4 -L https://repo.maven.apache.org/maven2/com/amazonaws/aws-lambda-java-serialization/1.1.2/aws-lambda-java-serialization-1.1.2.jar -o layer/aws-lambda-java-serialization-1.1.2.jar
 
-chmod 755 bootstrap && zip -r java17layer.zip jre17-slim bootstrap layer/aws-lambda-java-runtime-interface-client-1.1.0.jar layer/aws-lambda-java-core-1.2.1.jar layer/aws-lambda-java-serialization-1.0.0.jar
+chmod 755 bootstrap
+
+cp bootstrap layer
+
+pushd layer
+
+rm -rf jre21-slim
+unzip jre-21-slim.zip
+
+rm -f ../java21layer.zip
+zip -r ../java21layer.zip bootstrap jre21-slim aws-lambda-java-runtime-interface-client-2.4.1.jar aws-lambda-java-core-1.2.3.jar aws-lambda-java-serialization-1.1.2.jar
+
+popd