Switch Docker to jre17 LTS (#565)

OpenIdentityPlatform · Dec 8, 2022 · 5f31992 · 5f31992
1 parent 8071607
commit 5f31992
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
           file: ./openam-distribution/openam-distribution-docker/Dockerfile
           build-args: |
             VERSION=${{ env.release_version }}
-          platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le
+          platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le, linux/s390x
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -120,7 +120,7 @@ jobs:
           file: ./openam-distribution/openam-distribution-docker/Dockerfile
           build-args: |
             VERSION=${{ github.event.inputs.releaseVersion }}
-          platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le
+          platforms: linux/amd64, linux/arm64/8, linux/arm/v7, linux/ppc64le, linux/s390x
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

diff --git a/openam-distribution/openam-distribution-docker/Dockerfile b/openam-distribution/openam-distribution-docker/Dockerfile
@@ -1,13 +1,15 @@
-FROM tomcat:9-jre8
+FROM tomcat:9-jre17
 
 MAINTAINER Open Identity Platform Community <[email protected]>
 
 ENV CATALINA_HOME=/usr/local/tomcat \
     OPENAM_PATH="openam" \
     OPENAM_USER="openam" \
-    OPENAM_DATA_DIR="/usr/openam/config"    
+    OPENAM_DATA_DIR="/usr/openam/config" \
+    MAX_MEMORY="2g"   
 ENV PATH=$CATALINA_HOME/bin:$PATH \
-    CATALINA_OPTS="-XX:+UseG1GC -Xmx2048m -server -Dcom.iplanet.services.configpath=$OPENAM_DATA_DIR -Dcom.sun.identity.configuration.directory=$OPENAM_DATA_DIR"
+ 	JAVA_OPTS="--add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED" \
+    CATALINA_OPTS="-server -XX:+UseG1GC -Xmx$MAX_MEMORY -Dcom.iplanet.services.configpath=$OPENAM_DATA_DIR -Dcom.sun.identity.configuration.directory=$OPENAM_DATA_DIR"
 
 WORKDIR $CATALINA_HOME