Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue 30619 jemalloc #30621

Merged
merged 3 commits into from
Nov 12, 2024
Merged

issue 30619 jemalloc #30621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6e2062
feat(perf) setting jemalloc by default, can be unset by an env var
wezell Nov 11, 2024
3a335df
feat(perf) setting jemalloc by default, can be unset by an env var
wezell Nov 11, 2024
cc50651
feat(perf) setting jemalloc by default, can be unset by an env var
wezell Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .sdkmanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion dotCMS/src/main/docker/original/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ RUN apt update && \
libtcnative-1 \
tzdata \
ca-certificates \
libjemalloc2 \
openssl \
libapr1 \
libpq-dev && \
Expand Down Expand Up @@ -98,4 +99,4 @@ EXPOSE 8081
# Connect from proxy, HTTPS/443, secure
EXPOSE 8082
# Direct connect for HTTPS, secure
EXPOSE 8443
EXPOSE 8443
3 changes: 2 additions & 1 deletion dotCMS/src/main/docker/original/ROOT/srv/00-config-defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}