From 4ca210edd78bc00bb63ebc4ad834ae6627cc453a Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Fri, 17 Jul 2015 16:17:46 -0700 Subject: [PATCH] Removing references to boot2docker - Replace with machine references - 1.8 boot2docker is deprecated Signed-off-by: Mary Anthony --- docs/django.md | 3 +-- docs/index.md | 2 +- docs/rails.md | 4 ++-- docs/wordpress.md | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/django.md b/docs/django.md index 844c24f6e0..71df4e1168 100644 --- a/docs/django.md +++ b/docs/django.md @@ -115,8 +115,7 @@ Then, run `docker-compose up`: myapp_web_1 | Starting development server at http://0.0.0.0:8000/ myapp_web_1 | Quit the server with CONTROL-C. -Your Django app should nw be running at port 8000 on your Docker daemon (if -you're using Boot2docker, `boot2docker ip` will tell you its address). +Your Django app should nw be running at port 8000 on your Docker daemon. If you are using a Docker Machine VM, you can use the `docker-machine ip MACHINE_NAME` to get the IP address. You can also run management commands with Docker. To set up your database, for example, run `docker-compose up` and in another terminal run: diff --git a/docs/index.md b/docs/index.md index 62f2198ed9..6d949f88d3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -161,7 +161,7 @@ Now, when you run `docker-compose up`, Compose will pull a Redis image, build an web_1 | * Running on http://0.0.0.0:5000/ web_1 | * Restarting with stat -If you're using [Boot2docker](https://github.com/boot2docker/boot2docker), then `boot2docker ip` will tell you its address and you can open `http://ip-from-boot2docker:5000` in a browser. +If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` will tell you its address and you can open `http://MACHINE_VM_IP:5000` in a browser. If you're not using Boot2docker and are on linux, then the web app should now be listening on port 5000 on your Docker daemon host. If http://0.0.0.0:5000 doesn't resolve, you can also try localhost:5000. diff --git a/docs/rails.md b/docs/rails.md index cb8078647d..7394aadc8a 100644 --- a/docs/rails.md +++ b/docs/rails.md @@ -119,8 +119,8 @@ Finally, you need to create the database. In another terminal, run: $ docker-compose run web rake db:create -That's it. Your app should now be running on port 3000 on your Docker daemon (if -you're using Boot2docker, `boot2docker ip` will tell you its address). +That's it. Your app should now be running on port 3000 on your Docker daemon. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` returns the Docker host IP address. + ## More Compose documentation diff --git a/docs/wordpress.md b/docs/wordpress.md index 65a7d17f43..eda755c178 100644 --- a/docs/wordpress.md +++ b/docs/wordpress.md @@ -108,9 +108,7 @@ Second, `router.php` tells PHP's built-in web server how to run Wordpress: With those four files in place, run `docker-compose up` inside your Wordpress directory and it'll pull and build the needed images, and then start the web and -database containers. You'll then be able to visit Wordpress at port 8000 on your -Docker daemon (if you're using Boot2docker, `boot2docker ip` will tell you its -address). +database containers. If you're using [Docker Machine](https://docs.docker.com/machine), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser. ## More Compose documentation