1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Remove references to sudo in basics.md; see sudo instructions top of file

Browse Source 
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
This commit is contained in:
Mary Anthony 2015-08-05 09:07:11 -07:00 committed by Tibor Vass
parent f3f1340aa0
commit 8bd8ac0170
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/README.md
View File

@ -83,8 +83,8 @@ own.
container with this image. container with this image.
The container exposes port 8000 on the localhost so that you can connect and The container exposes port 8000 on the localhost so that you can connect and
see your changes. If you are running Boot2Docker, use the `boot2docker ip` see your changes. If you use Docker Machine, the `docker-machine ip
to get the address of your server. <machine-name>` command gives you the address of your server.
6. Check your writing for style and mechanical errors. 6. Check your writing for style and mechanical errors.
@ -154,18 +154,20 @@ update the root docs pages by running
$ make AWS_S3_BUCKET=dowideit-docs BUILD_ROOT=yes docs-release $ make AWS_S3_BUCKET=dowideit-docs BUILD_ROOT=yes docs-release
### Errors publishing using Boot2Docker ### Errors publishing using a Docker Machine VM
Sometimes, in a Boot2Docker environment, the publishing procedure returns this Sometimes, in a Windows or Mac environment, the publishing procedure returns this
error: error:
Post http:///var/run/docker.sock/build?rm=1&t=docker-docs%3Apost-1.2.0-docs_update-2: Post http:///var/run/docker.sock/build?rm=1&t=docker-docs%3Apost-1.2.0-docs_update-2:
dial unix /var/run/docker.sock: no such file or directory. dial unix /var/run/docker.sock: no such file or directory.
If this happens, set the Docker host. Run the following command to set the If this happens, set the Docker host. Run the following command to get the
variables in your shell: variables in your shell:
$ eval "$(boot2docker shellinit)" docker-machine env <machine-name>
Then, set your environment accordingly.
## Cherry-picking documentation changes to update an existing release. ## Cherry-picking documentation changes to update an existing release.

4
docs/reference/commandline/cli.md
View File

@ -10,10 +10,6 @@ parent = "smn_cli"
# Using the command line # Using the command line
> **Note:** If you are using a remote Docker daemon, such as Boot2Docker,
> then _do not_ type the `sudo` before the `docker` commands shown in the
> documentation's examples.
To list available commands, either run `docker` with no parameters To list available commands, either run `docker` with no parameters
or execute `docker help`: or execute `docker help`: