From 2d609432b916735d20018bde7b2f3ebcd973aba7 Mon Sep 17 00:00:00 2001 From: Audrey Roy Greenfeld Date: Sat, 3 Oct 2015 16:54:01 -0700 Subject: [PATCH] Add @jayfk's note from #356. --- docs/developing-locally-docker.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index fa3e670c..ec7686f1 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -18,10 +18,14 @@ If you don't already have these installed, you can get them at: * https://github.com/docker/toolbox/releases -Create the Machine -------------------- +Create the Machine (Optional) +------------------------------- -:: +On Ubuntu you have native Docker, so you don't need to create a VM with +docker-machine to use it. + +However, on Mac/Windows/other systems without native Docker, you'll want to +start by creating a VM with docker-machine:: $ docker-machine create --driver virtualbox dev1 @@ -29,7 +33,6 @@ Create the Machine name them accordingly. Instead of 'dev1' you might have 'dev2', 'myproject', 'djangopackages', et al. - Get the IP Address --------------------