fixes command execution ambiguity in compose/install.md (#2905)

* fixes command execution ambiguity in compose/install.md

Resolves #1678

* copyedit to kick build
This commit is contained in:
Suraj Narwade 2017-04-20 10:45:19 +05:30 committed by Victoria Bialas
parent e5c5cc9133
commit 09eee26ef3
1 changed files with 11 additions and 6 deletions

View File

@ -41,7 +41,7 @@ To install Compose, do the following:
5. Apply executable permissions to the binary:
```bash
$ chmod +x /usr/local/bin/docker-compose
$ sudo chmod +x /usr/local/bin/docker-compose
```
6. Optionally, install [command completion](completion.md) for the
@ -60,7 +60,7 @@ To install Compose, do the following:
### Install using pip
Compose can be installed from [pypi](https://pypi.python.org/pypi/docker-compose)
using `pip`. If you install using `pip`, it is highly recommended that you use a
using `pip`. If you install using `pip`, we recommend that you use a
[virtualenv](https://virtualenv.pypa.io/en/latest/) because many operating systems
have python system packages that conflict with docker-compose dependencies. See
the [virtualenv tutorial](http://docs.python-guide.org/en/latest/dev/virtualenvs/)
@ -69,6 +69,11 @@ to get started.
```bash
$ pip install docker-compose
```
if you are not using virtualenv,
```bash
$ sudo pip install docker-compose
```
> **Note**: pip version 6.0 or greater is required.
@ -78,8 +83,8 @@ Compose can also be run inside a container, from a small bash script wrapper.
To install compose as a container run:
```bash
$ curl -L --fail https://github.com/docker/compose/releases/download/1.11.2/run.sh > /usr/local/bin/docker-compose
$ chmod +x /usr/local/bin/docker-compose
$ curl -L https://github.com/docker/compose/releases/download/1.12.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
$ sudo chmod +x /usr/local/bin/docker-compose
```
## Master builds
@ -111,7 +116,7 @@ Alternatively, if you're not worried about keeping them, you can remove them.
Compose will just create new ones.
```bash
docker rm -f -v myapp_web_1 myapp_db_1 ...
$ docker rm -f -v myapp_web_1 myapp_db_1 ...
```
## Uninstallation
@ -119,7 +124,7 @@ docker rm -f -v myapp_web_1 myapp_db_1 ...
To uninstall Docker Compose if you installed using `curl`:
```bash
rm /usr/local/bin/docker-compose
$ sudo rm /usr/local/bin/docker-compose
```
To uninstall Docker Compose if you installed using `pip`: