This is an automated email from the ASF dual-hosted git repository.

mraible pushed a commit to branch base64-option-adds-to-catalina-opts
in repository https://gitbox.apache.org/repos/asf/roller.git

commit f05b3cfe21c2280850af191d22e381b9ecd52401
Author: Matt Raible <[email protected]>
AuthorDate: Tue Nov 17 19:54:23 2026 -0700

    Add the Docker image's Base64 option to any CATALINA_OPTS passed in
    
    The Dockerfile set CATALINA_OPTS with ENV, so a CATALINA_OPTS passed to the 
container replaced it. The entry point now puts -XX:-UseBASE64Intrinsics in 
front of whatever CATALINA_OPTS holds, so a container's own options add to it.
---
 Dockerfile            | 6 ------
 docker/entry-point.sh | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5082126c7..41250ff51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,12 +69,6 @@ RUN wget 
https://repo1.maven.org/maven2/jakarta/mail/jakarta.mail-api/2.1.5/jaka
 RUN wget 
https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.1.4/jakarta.activation-api-2.1.4.jar
 RUN wget 
https://repo1.maven.org/maven2/org/eclipse/angus/angus-activation/2.0.3/angus-activation-2.0.3.jar
 
-# Turn off the JVM's hardware-accelerated Base64 decoding, which has an
-# out-of-bounds write on x86-64 processors with AVX-512 in JDKs older than the
-# November 2026 updates (CVE-2026-114938). It only costs Base64 speed; an
-# image built on a patched JDK can drop it.
-ENV CATALINA_OPTS="-XX:-UseBASE64Intrinsics"
-
 # Add Roller entry-point and go!
 
 COPY docker/entry-point.sh /usr/local/tomcat/bin
diff --git a/docker/entry-point.sh b/docker/entry-point.sh
index 19490af0d..1521d2998 100755
--- a/docker/entry-point.sh
+++ b/docker/entry-point.sh
@@ -43,5 +43,12 @@ users.oidc.autoProvision.enabled=${OIDC_AUTO_PROVISION:-true}
 EOF
 fi
 
+# Turn off the JVM's hardware-accelerated Base64 decoding, which has an
+# out-of-bounds write on x86-64 processors with AVX-512 in JDKs older than the
+# November 2026 updates (CVE-2026-114938). It only costs Base64 speed; an
+# image built on a patched JDK can drop it. It goes before any CATALINA_OPTS
+# passed to the container, so those options add to it.
+export CATALINA_OPTS="-XX:-UseBASE64Intrinsics ${CATALINA_OPTS}"
+
 /usr/local/tomcat/bin/wait-for-it.sh ${DATABASE_HOST}
 exec /usr/local/tomcat/bin/catalina.sh run

Reply via email to