Use Proton root for Docker user override#1185
Open
BharatDeva wants to merge 1 commit into
Open
Conversation
|
|
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.
PR checklist:
proton: starts/endsfor new code in existing community code base ? Not applicable for the Docker entrypoint shell script.Please write user-readable short description of the changes:
This updates the Docker entrypoint path that handles
PROTON_USER,PROTON_PASSWORD, andPROTON_DEFAULT_ACCESS_MANAGEMENT.When those environment variables are provided, the entrypoint now writes a
users.d/default-user.xmloverride using Proton's<proton>root element. That matches the root used by the Proton server config and avoids the config merge failure reported when Docker env-based user configuration is enabled.The generated XML also escapes env-derived values and validates the username before using it as an XML element name.
Validation performed:
Result: shell syntax check passed.
Result:
Fixes #927