diff --git a/Dockerfile.base b/Dockerfile.base index 800bd4d..4679d18 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -54,7 +54,6 @@ RUN apt-env.sh apt-get update ; \ jdupes \ jq \ libcap2-bin \ - libjemalloc2 \ logrotate \ netbase \ netcat-openbsd \ diff --git a/image-entry.sh b/image-entry.sh index 2c3432a..d8fab2d 100755 --- a/image-entry.sh +++ b/image-entry.sh @@ -25,11 +25,6 @@ iep_preserve_env() { unset __IEP_MALLOC_ARENA_MAX __IEP_MALLOC_ARENA_MAX="${MALLOC_ARENA_MAX:-4}" export MALLOC_ARENA_MAX=2 - - ## jemalloc: preserve MALLOC_CONF - unset __IEP_MALLOC_CONF - __IEP_MALLOC_CONF="${MALLOC_CONF:-}" - unset MALLOC_CONF } iep_restore_env() { @@ -52,12 +47,6 @@ iep_restore_env() { export MALLOC_ARENA_MAX="${__IEP_MALLOC_ARENA_MAX}" fi unset __IEP_MALLOC_ARENA_MAX - - ## jemalloc: restore MALLOC_CONF - if [ -n "${__IEP_MALLOC_CONF:-}" ] ; then - export MALLOC_CONF="${__IEP_MALLOC_CONF}" - fi - unset __IEP_MALLOC_CONF } iep_flush_volume() { diff --git a/j2cfg/j2cfg/settings.py b/j2cfg/j2cfg/settings.py index 473d20d..9ddd82a 100644 --- a/j2cfg/j2cfg/settings.py +++ b/j2cfg/j2cfg/settings.py @@ -34,8 +34,6 @@ J2CFG_PRESERVE_ENVS = [ # glibc 'GLIBC_TUNABLES', 'MALLOC_ARENA_MAX', - # jemalloc - 'MALLOC_CONF', ] J2CFG_PASSTHROUGH_ENVS = [