Skip to content

Add the Docker image's Base64 option to any CATALINA_OPTS passed in - #338

Merged
mraible merged 2 commits into
masterfrom
base64-option-adds-to-catalina-opts
Nov 18, 2026
Merged

mraible merged 2 commits into
masterfrom
base64-option-adds-to-catalina-opts

Conversation

@mraible

@mraible mraible commented Nov 18, 2026

Copy link
Copy Markdown
Contributor

Follows up #311 from review.

The Dockerfile set CATALINA_OPTS="-XX:-UseBASE64Intrinsics" with ENV, so a CATALINA_OPTS passed to the container replaced it and dropped the option. The ENV line is gone, and docker/entry-point.sh now puts -XX:-UseBASE64Intrinsics in front of whatever CATALINA_OPTS holds before starting Tomcat, so a container's own options add to it.

The CHANGES entry from #311 now says that a CATALINA_OPTS passed 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.sh and CHANGES.md change.

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.
@mraible
mraible requested a review from snoopdave November 18, 2026 04:16

@snoopdave snoopdave left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mraible
mraible merged commit e3f8fa9 into master Nov 18, 2026
9 checks passed
@mraible
mraible deleted the base64-option-adds-to-catalina-opts branch November 18, 2026 23:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants