diff --git a/.sdkmanrc b/.sdkmanrc index e7157c3aa149..136ebd68fe6a 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1 +1,3 @@ +# sets the SDKMAN_JAVA_VERSION for dotCMS +# this is the version of java that will be used as the base image for the docker build java=21.0.4-ms diff --git a/dotCMS/src/main/docker/original/Dockerfile b/dotCMS/src/main/docker/original/Dockerfile index 4a90eaf47886..bc80eb7535b6 100644 --- a/dotCMS/src/main/docker/original/Dockerfile +++ b/dotCMS/src/main/docker/original/Dockerfile @@ -52,6 +52,7 @@ RUN apt update && \ libtcnative-1 \ tzdata \ ca-certificates \ + libjemalloc2 \ openssl \ libapr1 \ libpq-dev && \ @@ -98,4 +99,4 @@ EXPOSE 8081 # Connect from proxy, HTTPS/443, secure EXPOSE 8082 # Direct connect for HTTPS, secure -EXPOSE 8443 \ No newline at end of file +EXPOSE 8443 diff --git a/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh b/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh index 878618e9941c..e578ac1bd8c8 100755 --- a/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh +++ b/dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh @@ -112,4 +112,5 @@ export CUSTOM_STARTER_URL=${CUSTOM_STARTER_URL:-""} ## This needs to be set in order for catalina to read environmental properties export CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource" - +## export the environment variable for jemalloc +export LD_PRELOAD=${LD_PRELOAD:-"/usr/lib/`uname -m`-linux-gnu/libjemalloc.so.2"}