diff options
Diffstat (limited to 'doc/install')
-rw-r--r-- | doc/install/dev-setup.md | 11 | ||||
-rw-r--r-- | doc/install/single-container-install.md | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/doc/install/dev-setup.md b/doc/install/dev-setup.md index b90b6a351..c63bde512 100644 --- a/doc/install/dev-setup.md +++ b/doc/install/dev-setup.md @@ -3,13 +3,14 @@ Developer Machine Setup ### Mac OS X ### -1. Download and set up Boot2Docker +1. Download and set up Docker Toolbox 1. Follow the instructions at http://docs.docker.com/installation/mac/ - 1. Use the Boot2Docker command-line utility - 2. If you do command-line setup use: `boot2docker init eval “$(boot2docker shellinit)”` - 2. Get your Docker IP address with `boot2docker ip` + 2. Start a new docker host + `docker-machine create -d virtualbox dev` + 2. Get the IP address of your docker host + `docker-machine ip dev` 3. Add a line to your /etc/hosts that goes `<Docker IP> dockerhost` - 4. Run `boot2docker shellinit` and copy the export statements to your ~/.bash_profile + 4. Run `docker-machine env dev` and copy the export statements to your ~/.bash_profile 2. Download Go (version 1.4.2) from http://golang.org/dl/ 3. Set up your Go workspace 1. `mkdir ~/go` diff --git a/doc/install/single-container-install.md b/doc/install/single-container-install.md index 772f3becf..fa5265773 100644 --- a/doc/install/single-container-install.md +++ b/doc/install/single-container-install.md @@ -4,11 +4,11 @@ The following install instructions are for single-container installs of Mattermo ### Mac OSX ### -1. Install Boot2Docker using instructions at: http://docs.docker.com/installation/mac/ - 1. Start Boot2Docker from the command line and run: `boot2docker init eval “$(boot2docker shellinit)”` -2. Get your Docker IP address with: `boot2docker ip` +1. Install Docker Toolbox using instructions at: http://docs.docker.com/installation/mac/ + 1. Start Docker Toolbox from the command line and run: `docker-machine create -d virtualbox dev”` +2. Get your Docker IP address with: `docker-machine ip dev` 3. Use `sudo nano /etc/hosts` to add `<Docker IP> dockerhost` to your /etc/hosts file -4. Run: `boot2docker shellinit` and copy the export statements to your ~/.bash\_profile by running `sudo nano ~/.bash_profile`. Then run: `source ~/.bash_profile` +4. Run: `docker-machine env dev` and copy the export statements to your ~/.bash\_profile by running `sudo nano ~/.bash_profile`. Then run: `source ~/.bash_profile` 5. Run: `docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform` 6. When docker is done fetching the image, open http://dockerhost:8065/ in your browser. |