Repository navigation
fix(site): keep admin-tools mounts when site containers are recreated #535
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mrrobot47
wants to merge
1
commit into
EasyEngine:develop
Choose a base branch
from
mrrobot47:fix/ssl-update-keep-admin-tools
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check the nginx start result before saving alias changes.
Both
up_site_containers()calls at lines 635 and 705 discard afalsereturn. For sites withadmin_toolsenabled, the call includesdocker-compose-admin.yml, so the admin overlay can make the start fail. When that happens, the command still saves the new alias domains, firessite_alias_domains_updated, and reports success. Nginx can keep serving the previous configuration. The ignored result predates this change for the basedocker_compose_up()calls. The admin overlay makes this failure reachable on the alias path.Check both results:
site_alias_domains_updated. First restore the previous nginx configuration, then run the failure hook.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ignored result predates this PR: the alias flow already discarded
docker_compose_up()here. The overlay only fails if the generated file exists and is invalid. Checking both starts and rolling the alias change back is a wider change to the alias flow, so it is tracked as a separate fix rather than added here.