Add new Nginx config to base image #918
Merged
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
This commit moves the Nginx config from discourse/discourse repository and updates it with several 'include' statements that serve as extension outlets. This change was made to place the config closer to where it is used and implements an alternative to the "find & replace" hacks. It is unused at this moment, but all templates and samples will be updated in a future commit.
nbianca
force-pushed
the
dev-nginx-conf-2
branch
from
b0b30f8 to
719ef69
Compare
nbianca
changed the title
tgxworld
approved these changes
Jan 20, 2025
|
@nbianca Do confirm that the existing web template will override the nginx conf file that has been added to the base image: discourse_docker/templates/web.template.yml Line 135 in 136c638 |
|
nbianca
added a commit
that referenced
this pull request
Jan 22, 2025
We have decided to go another route and keep the Nginx config in the Discourse repository, but add the outlets there. This reverts commit 32dc866.
tgxworld
pushed a commit
that referenced
this pull request
Jan 23, 2025
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.
This commit moves the Nginx config from discourse/discourse repository
and updates it with several 'include' statements that serve as extension
outlets.
This change was made to place the config closer to where it is used and
implements an alternative to the "find & replace" hacks.
It is unused at this moment, but all templates and samples will be
updated in a future commit.