summaryrefslogtreecommitdiffstats
path: root/doc/install/dev-setup.md
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-09-30 19:30:45 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-09-30 19:30:45 +0500
commit296b93076888c9b26329938bd1cf1587397c7f51 (patch)
treea37a396752971c88e13fc97d88531357ca09542e /doc/install/dev-setup.md
parentfb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff)
parent13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff)
downloadchat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz
chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2
chat-296b93076888c9b26329938bd1cf1587397c7f51.zip
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'doc/install/dev-setup.md')
-rw-r--r--doc/install/dev-setup.md11
1 files changed, 6 insertions, 5 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`