From 5f3c15e5e73fcf034b73b44570c92edcd78d1df5 Mon Sep 17 00:00:00 2001
From: Alexander <alex.aleschenko@gmail.com>
Date: Fri, 20 Sep 2024 15:57:15 +0300
Subject: [PATCH] Always install jemalloc

---
 docker/prod/Dockerfile                 | 17 ++++++++---------
 docker/prod/setup/preinstall-common.sh |  6 +-----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 45c1ce38172..6c6c629bd15 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -5,8 +5,7 @@ LABEL maintainer="operations@openproject.com"
 ARG BUNDLER_VERSION="2.5.13"
 ARG NODE_VERSION="20.9.0"
 ARG BIM_SUPPORT=true
-ARG USE_JEMALLOC=false
-ENV USE_JEMALLOC=${USE_JEMALLOC}
+ENV USE_JEMALLOC=false
 ENV DEBIAN_FRONTEND=noninteractive
 ENV BUNDLE_JOBS=8
 ENV BUNDLE_RETRY=3
@@ -39,8 +38,8 @@ ENV OPENPROJECT_RAILS__CACHE__STORE=file_store
 ENV OPENPROJECT_ANGULAR_UGLIFY=true
 
 RUN useradd -d /home/$APP_USER -m $APP_USER && \
-    mkdir -p $APP_PATH && chown $APP_USER:$APP_USER $APP_PATH && \
-    mkdir -p $APP_DATA_PATH && chown $APP_USER:$APP_USER $APP_DATA_PATH && chmod g+rwx $APP_DATA_PATH
+  mkdir -p $APP_PATH && chown $APP_USER:$APP_USER $APP_PATH && \
+  mkdir -p $APP_DATA_PATH && chown $APP_USER:$APP_USER $APP_DATA_PATH && chmod g+rwx $APP_DATA_PATH
 
 WORKDIR $APP_PATH
 
@@ -73,10 +72,10 @@ COPY . .
 
 # Copy lock file again as the updated version was overriden by COPY just now
 RUN cp Gemfile.lock.bak Gemfile.lock && rm Gemfile.lock.bak && \
-    ./docker/prod/setup/precompile-assets.sh && \
-    ./docker/prod/setup/postinstall-common.sh && \
-    cp ./config/database.production.yml config/database.yml && \
-    ln -s $APP_PATH/docker/prod/setup/.irbrc /home/$APP_USER/
+  ./docker/prod/setup/precompile-assets.sh && \
+  ./docker/prod/setup/postinstall-common.sh && \
+  cp ./config/database.production.yml config/database.yml && \
+  ln -s $APP_PATH/docker/prod/setup/.irbrc /home/$APP_USER/
 
 # -------------------------------------
 # slim (public)
@@ -100,7 +99,7 @@ ENV PGDATA=/var/openproject/pgdata
 ENV GOSU_VERSION="1.17"
 
 RUN ./docker/prod/setup/postinstall-onprem.sh && \
-    ln -s /app/docker/prod/setup/.irbrc /root/
+  ln -s /app/docker/prod/setup/.irbrc /root/
 
 # Expose ports for apache and postgres
 EXPOSE 80
diff --git a/docker/prod/setup/preinstall-common.sh b/docker/prod/setup/preinstall-common.sh
index fd76a5b2b47..976cc5d2b5b 100755
--- a/docker/prod/setup/preinstall-common.sh
+++ b/docker/prod/setup/preinstall-common.sh
@@ -50,13 +50,9 @@ apt-get install -yq --no-install-recommends \
 	catdoc \
 	imagemagick \
 	libclang-dev \
+	libjemalloc2 \
 	git
 
-# Install jemalloc
-if [ "$USE_JEMALLOC" = "true" ]; then
-	apt-get install -yq libjemalloc2
-fi
-
 # Specifics for BIM edition
 if [ ! "$BIM_SUPPORT" = "false" ]; then
 	apt-get install -y wget unzip