Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/dev-env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ RUN chmod 777 /data
# Installing basic packages
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends bash zip unzip wget libtcnative-1\
tzdata tini ca-certificates openssl libapr1 libpq-dev curl gnupg\
apt-get install -y --no-install-recommends bash zip unzip wget \
tzdata tini ca-certificates openssl libpq-dev curl gnupg\
vim libarchive-tools postgresql-common


Expand Down
2 changes: 1 addition & 1 deletion docker/java-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV PATH="$SDKMAN_DIR/bin:$PATH"
# Installing basic packages and SDKMAN
RUN apt update && \
apt upgrade -y && \
apt install -y --no-install-recommends zip unzip wget libtcnative-1 tzdata tini ca-certificates openssl libapr1 libpq-dev curl gnupg && \
apt install -y --no-install-recommends zip unzip wget tzdata tini ca-certificates openssl libpq-dev curl gnupg && \
rm -rf /var/lib/apt/lists/* && \
wget -O - https://get.sdkman.io | bash && \
bash -c "source $SDKMAN_DIR/bin/sdkman-init.sh && sdk install java ${SDKMAN_JAVA_VERSION} && sdk flush archives" && \
Expand Down
2 changes: 0 additions & 2 deletions dotCMS/src/main/docker/original/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ RUN apt update && \
tini \
zip \
unzip \
libtcnative-1 \
tzdata \
ca-certificates \
libmimalloc2.0 \
openssl \
libapr1 \
libpq-dev && \
rm -rf /var/lib/apt/lists/*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Server port="${CMS_SERVER_PORT:-8005}" shutdown="${CMS_SERVER_SHUTDOWN:-SHUTDOWN}">
<Listener className="org.apache.catalina.startup.VersionLoggerListener" />
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="${CMS_SSL_ENGINE:-on}" />
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="${CMS_SSL_ENGINE:-off}" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Service name="Catalina">
<Executor
Expand Down
2 changes: 1 addition & 1 deletion dotcms-integration/src/test/resources/server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="off" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
Expand Down