diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
| commit | 8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73 (patch) | |
| tree | 84e426d92eccf017f0fd5ccd22815a2139bd6e44 /doc | |
| parent | 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (diff) | |
| parent | 9c045f0d4bdf254f57b94356fd2f5f2a2408ed03 (diff) | |
| download | chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.gz chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.bz2 chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.zip | |
Fixing merge
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer/Setup.md | 2 | ||||
| -rw-r--r-- | doc/install/Docker-Single-Container.md | 7 | ||||
| -rw-r--r-- | doc/install/Troubleshooting.md | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/developer/Setup.md b/doc/developer/Setup.md index afaef4ee4..d806b7a9b 100644 --- a/doc/developer/Setup.md +++ b/doc/developer/Setup.md @@ -61,7 +61,7 @@ Any issues? Please let us know on our forums at: http://forum.mattermost.org 3. Reload your bashrc `source ~/.bashrc` 6. Install Node.js - 1. Download the newest version of the Node.js sources from https://nodejs.org/download/ + 1. Download the newest version of the Node.js sources from https://nodejs.org/en/download/ 2. Extract the contents of the package and cd into the extracted files 3. Compile and install Node.js `./configure` diff --git a/doc/install/Docker-Single-Container.md b/doc/install/Docker-Single-Container.md index 4b952cd71..7c0784ad0 100644 --- a/doc/install/Docker-Single-Container.md +++ b/doc/install/Docker-Single-Container.md @@ -2,6 +2,13 @@ The following install instructions are for single-container installs of Mattermost using Docker for exploring product functionality and upgrading to newer versions. +### One-line Docker Install ### + +If you have Docker set up, Mattermost installs in one-line: +`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform` + +Otherwise, see step-by-step available: + ### Mac OSX ### 1. Install Docker Toolbox using instructions at: http://docs.docker.com/installation/mac/ diff --git a/doc/install/Troubleshooting.md b/doc/install/Troubleshooting.md index 8d82100d8..b87663ab3 100644 --- a/doc/install/Troubleshooting.md +++ b/doc/install/Troubleshooting.md @@ -3,5 +3,5 @@ #### Important notes 1. **DO NOT manipulate the Mattermost database** - - In particular, DO NOT delete data from the database, as this will most likely crash Mattermost in strange ways. Mattermost is designed to archive content continously and generally assumes data is never deleted. + - In particular, DO NOT delete data from the database, as Mattermost is designed to stop working if data integrity has been compromised. The system is designed to archive content continously and generally assumes data is never deleted. |