diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md index edaddfa41b..5e2df14696 100644 --- a/compose/gettingstarted.md +++ b/compose/gettingstarted.md @@ -17,6 +17,8 @@ provided by Docker images. ## Step 1: Setup +Define the application dependencies. + 1. Create a directory for the project: $ mkdir composetest @@ -46,9 +48,6 @@ provided by Docker images. flask redis - These define the application's dependencies. - - ## Step 2: Create a Dockerfile In this step, you write a Dockerfile that builds a Docker image. The image @@ -132,12 +131,13 @@ Hub registry. 2. Enter `http://0.0.0.0:5000/` in a browser to see the application running. - If you're using Docker natively on Linux, Docker for Mac, or Docker - for Windows, then the web app should now be listening on port 5000 - on your Docker daemon host. Point your web browser to `http://localhost:5000` to find the `Hello World` message. If this - doesn't resolve, you can also try `http://0.0.0.0:5000`. + If you're using Docker natively on Linux, Docker for Mac, or Docker for + Windows, then the web app should now be listening on port 5000 on your + Docker daemon host. Point your web browser to `http://localhost:5000` to + find the `Hello World` message. If this doesn't resolve, you can also try + `http://0.0.0.0:5000`. - If you're using Docker Machine on a Mac, use `docker-machine ip + If you're using Docker Machine on a Mac or Windows, use `docker-machine ip MACHINE_VM` to get the IP address of your Docker host. Then, open `http://MACHINE_VM_IP:5000` in a browser. @@ -167,7 +167,7 @@ Hub registry. ``` $ docker image ls REPOSITORY TAG IMAGE ID CREATED SIZE - composetest_web latest e2c21aa48cc1 4 minutes ago 93.8MB + composetest_web latest e2c21aa48cc1 4 minutes ago 93.8MB python 3.4-alpine 84e6077c7ab6 7 days ago 82.5MB redis alpine 9d8fa9aa0e5b 3 weeks ago 27.5MB ``` diff --git a/compose/install.md b/compose/install.md index 0ae56d61de..a4fcfe30ee 100644 --- a/compose/install.md +++ b/compose/install.md @@ -103,33 +103,15 @@ target="_blank" class="_"}. Follow the instructions from the link, which involve running the `curl` command in your terminal to download the binaries. These step by step instructions are also included below. -1. Run this command to download Docker Compose, replacing -`$dockerComposeVersion` with the specific version of Compose you want to use: +1. Run this command to download the latest version of Docker Compose: ```bash - sudo -i - curl -L -https://github.com/docker/compose/releases/download/$dockerComposeVersion/docker-compose-`uname --s`-`uname -m` -o /usr/local/bin/docker-compose - ``` - - For example, to download Compose version {{composeversion}}, the command - is: - - ```bash - sudo -i - curl -L https://github.com/docker/compose/releases/download/{{composeversion}}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose + sudo curl -L https://github.com/docker/compose/releases/download/{{composeversion}}/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose ``` > Use the latest Compose release number in the download command. > - The above command is an _example_, and it may become out-of-date once - in a while. Always follow the command pattern shown above it. If - you cut-and-paste an example, check which release it specifies and, - if needed, replace `$dockerComposeVersion` with the release number that - you want. Compose releases are also available for direct download on - the [Compose repository release page on GitHub](https://github.com/docker/compose/releases){: target="_blank" - class="_"}. + The above command is an _example_, and it may become out-of-date. To ensure you have the latest version, check the [Compose repository release page on GitHub](https://github.com/docker/compose/releases){: target="_blank" class="_"}. {: .important} If you have problems installing with `curl`, see @@ -149,7 +131,7 @@ https://github.com/docker/compose/releases/download/$dockerComposeVersion/docker ```bash $ docker-compose --version docker-compose version {{composeversion}}, build 1719ceb - ``` + ```