Repository navigation
Add the Docker image's Base64 option to any CATALINA_OPTS passed in - #338
Merged
Merged
Conversation
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.
snoopdave
approved these changes
Nov 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follows up #311 from review.
The Dockerfile set
CATALINA_OPTS="-XX:-UseBASE64Intrinsics"withENV, so aCATALINA_OPTSpassed to the container replaced it and dropped the option. TheENVline is gone, anddocker/entry-point.shnow puts-XX:-UseBASE64Intrinsicsin front of whateverCATALINA_OPTSholds before starting Tomcat, so a container's own options add to it.The CHANGES entry from #311 now says that a
CATALINA_OPTSpassed to the container is added to this option, instead of telling admins to include the option in theirs.No test changes; only
Dockerfile,docker/entry-point.shandCHANGES.mdchange.