Skip to content

Use Proton root for Docker user override#1185

Open
BharatDeva wants to merge 1 commit into
timeplus-io:developfrom
BharatDeva:fix/docker-default-user-root
Open

Use Proton root for Docker user override#1185
BharatDeva wants to merge 1 commit into
timeplus-io:developfrom
BharatDeva:fix/docker-default-user-root

Conversation

@BharatDeva
Copy link
Copy Markdown

PR checklist:

  • Did you run ClangFormat ? Not applicable; this changes a shell script.
  • Did you separate headers to a different section in existing community code base ? Not applicable.
  • Did you surround proton: starts/ends for 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, and PROTON_DEFAULT_ACCESS_MANAGEMENT.

When those environment variables are provided, the entrypoint now writes a users.d/default-user.xml override 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:

wsl -e bash -n docker/server/entrypoint.sh

Result: shell syntax check passed.

git show --check --oneline --summary HEAD

Result:

32d49afa Use Proton root for Docker user override

Fixes #927

@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

When setting PROTON_USER and PROTON_PASSWORD env variables, config merge causes proton to crash

2 participants