This repository has been archived by the owner on May 20, 2022. It is now read-only.
Fix the linking of the nginx configuration file #458
Merged
Conversation
This file contains 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
In this commit I'm adding some logic to ensure that the `entrypoint.sh` file handles a pre-existing `mattermost.conf` file within the nginx folder. During deployment of some more custom nginx configuration it was noticed that the linking process fails, because a file already exists with the filesystem. Signed-off-by: Akendo <akendo@akendo.eu>
|
/check-cla |
cpanato
approved these changes
Apr 1, 2020
cpanato
added
3: Reviews Complete
nickygerritsen
added a commit
to Lets-Talk-NL/mattermost-docker
that referenced
this pull request
Jun 29, 2020
* upstream/master: (54 commits) bump to 5.24.2 bump MM to 5.24.1 bump MM to 5.24.0 Update Dockerfile (mattermost#476) Add ?src=docker-app query parameter to identify download source (mattermost#475) bump docker app to 5.23.0 Fix : certificate signed by unknown authority refs : mattermost/mattermost#13059 (mattermost#474) bump app dockerfile to 5.22.3 Fixing docker-compose build process (mattermost#471) bump mm to 5.22.1 Update Dockerfile (mattermost#467) docker-compose: fix DB Docker building error mattermost#463 related wal-e 1.0.0 and azure (mattermost#464) allow uncommenting for team edition (mattermost#433) Fix the linking of the nginx configuration file (mattermost#458) docker-compose: remove unused ENV variable (mattermost#456) bump mm prod app to 5.21.0 bump mm prod app to 5.20.2 web entrypoint: forcefully link existing config (mattermost#454) Remove deprecated nginx ssl directive (mattermost#451) (mattermost#452) bump mm prod app to 5.20.1 ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
In this commit I'm adding some logic to ensure that the
entrypoint.shfile handles a pre-existing
mattermost.conffile within the nginxfolder.
During deployment of some more custom nginx configuration it was
noticed that the linking process fails, because a file already exists
with the filesystem.
Signed-off-by: Akendo akendo@akendo.eu
Summary
Ticket Link