Skip to content

Commit 85b3004

Browse files
authored
Merge pull request rails#51084 from anonychun/dont-override-ld-preload
Dont override LD_PRELOAD value
2 parents 6985c3b + 74a532c commit 85b3004

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

railties/lib/rails/generators/rails/app/templates/docker-entrypoint.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash -e
22

33
# Enable jemalloc for reduced memory usage and latency.
4-
if [ -f /usr/lib/*/libjemalloc.so.2 ]; then
5-
export LD_PRELOAD="$(echo /usr/lib/*/libjemalloc.so.2) $LD_PRELOAD"
4+
if [ -z "${LD_PRELOAD+x}" ] && [ -f /usr/lib/*/libjemalloc.so.2 ]; then
5+
export LD_PRELOAD="$(echo /usr/lib/*/libjemalloc.so.2)"
66
fi
77

88
<% unless skip_active_record? -%>

0 commit comments

Comments
 (0)