From 8bd8ac0170fd867ca6e31be114080dc61309340b Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Wed, 5 Aug 2015 09:07:11 -0700 Subject: [PATCH] - Remove references to sudo in basics.md; see sudo instructions top of file - 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 --- docs/README.md | 14 ++++++++------ docs/reference/commandline/cli.md | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/README.md b/docs/README.md index c05d8a3ff7..340d84052c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -83,8 +83,8 @@ own. container with this image. 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` - to get the address of your server. + see your changes. If you use Docker Machine, the `docker-machine ip + ` command gives you the address of your server. 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 -### 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: 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. -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: - $ eval "$(boot2docker shellinit)" + docker-machine env + +Then, set your environment accordingly. ## Cherry-picking documentation changes to update an existing release. diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index 98bbfd1c9e..2766bb4dac 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -10,10 +10,6 @@ parent = "smn_cli" # 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 or execute `docker help`: