Skip to content

Documenting how to change the default docker-compose network#3480

Merged
justinegeffen merged 4 commits intomattermost:masterfrom
RohitJain13:master
Mar 30, 2020
Merged

Documenting how to change the default docker-compose network#3480
justinegeffen merged 4 commits intomattermost:masterfrom
RohitJain13:master

Conversation

@RohitJain13
Copy link
Copy Markdown

@RohitJain13 RohitJain13 commented Mar 25, 2020

Summary

Addresses the following issue: Request for Documentation: Docker bridge network can interfere with the Mattermost VPN and DNS resolution for internal.mattermost.com (172.18.0.0/16) #459.

Ticket Link

Fixes mattermost/mattermost-developer-documentation#459

Rohit Jain added 2 commits March 25, 2020 18:07
Addresses issue: mattermost/mattermost-developer-documentation#459

Request for Documentation: Docker bridge network can interfere with the Mattermost VPN and DNS resolution for internal.mattermost.com (172.18.0.0/16) mattermost#459
Comment thread source/install/prod-docker.rst Outdated
Comment thread source/install/prod-docker.rst Outdated
Rohit Jain and others added 2 commits March 27, 2020 19:15
Co-Authored-By: Justine Geffen <justinegeffen@users.noreply.github.com>
Co-Authored-By: Justine Geffen <justinegeffen@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

@jaydeland jaydeland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Copy link
Copy Markdown
Contributor

@justinegeffen justinegeffen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, LGTM!

@justinegeffen justinegeffen added 3: Reviews Complete All reviewers have approved the pull request and removed 2: Editor Review Requires review by an editor 1: Dev Review Requires review by a core commiter labels Mar 30, 2020
@justinegeffen justinegeffen merged commit 1873cf1 into mattermost:master Mar 30, 2020
@amyblais amyblais removed the 3: Reviews Complete All reviewers have approved the pull request label Mar 30, 2020
justinegeffen pushed a commit that referenced this pull request Apr 6, 2020
* master:
  Added Let's Encrypt clarification  (#2866)
  Update security.rst (#3434)
  Update sg_grammar-spelling-mechanics.rst (#3462)
  Update training.rst (#3485)
  Update release-faq.rst (#3484)
  Documenting how to change the default docker-compose network (#3480)
  Fixes GH-542-Moved : Request for Documentation: Add to interactive-messages documentation (#3482)
  Correct Code Block Formatting (#3477)
  Update mmctl-cli-tool.rst (#3481)
  FAQ on Archived Channels and data retention (#3470)
  Update desktop-changelog.rst (#3473)
  Update desktop-changelog.rst (#3471)
  Added Video to AD/LDAP Group Sync (#3450)
  Hint to `"skip_slack_parsing"` to ignore Slack-compatibility logic (#3427)
  Update bug-severity-guidelines.rst (#3467)
  Moving Push Proxy related entry to developer documentation (#3448)
justinegeffen pushed a commit that referenced this pull request Apr 8, 2020
…/docs into justinegeffen-patch-7

* 'justinegeffen-patch-7' of https://github.com/mattermost/docs: (90 commits)
  Update integrations.rst
  Remove Oracle from Bitnami packages (#3491)
  Revert "Adding NPS rating for docs pages (#3469)" (#3495)
  Add Plugin Labels and Prepackaged Plugin Info (#3395)
  Adding NPS rating for docs pages (#3469)
  Fix broken link in Bot Account Creation > Plugin (#3493)
  Added Let's Encrypt clarification  (#2866)
  Update security.rst (#3434)
  Update sg_grammar-spelling-mechanics.rst (#3462)
  Update training.rst (#3485)
  Update release-faq.rst (#3484)
  Documenting how to change the default docker-compose network (#3480)
  Fixes GH-542-Moved : Request for Documentation: Add to interactive-messages documentation (#3482)
  Correct Code Block Formatting (#3477)
  Update mmctl-cli-tool.rst (#3481)
  FAQ on Archived Channels and data retention (#3470)
  Update desktop-changelog.rst (#3473)
  Update desktop-changelog.rst (#3471)
  Added Video to AD/LDAP Group Sync (#3450)
  Hint to `"skip_slack_parsing"` to ignore Slack-compatibility logic (#3427)
  ...

# Conflicts:
#	source/install/troubleshooting.rst
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.

Request for Documentation: Docker bridge network can interfere with the Mattermost VPN and DNS resolution for internal.mattermost.com (172.18.0.0/16)

5 participants