docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #795 from tianon/eval-env 

Add "eval" to every invocation of "docker-machine env"
This commit is contained in:
Evan Hazlett 2015-03-16 22:53:21 -04:00
parent cb7a488c62 d6e3dd6b06
commit 89ea1ed4b4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -13,13 +13,13 @@ INFO[0000] Creating VirtualBox VM...
INFO[0007] Starting VirtualBox VM... INFO[0007] Starting VirtualBox VM...
INFO[0007] Waiting for VM to start... INFO[0007] Waiting for VM to start...
INFO[0041] "dev" has been created and is now the active machine. INFO[0041] "dev" has been created and is now the active machine.
INFO[0041] To point your Docker client at it, run this in your shell: $(docker-machine env dev) INFO[0041] To point your Docker client at it, run this in your shell: eval "$(docker-machine env dev)"
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL SWARM NAME ACTIVE DRIVER STATE URL SWARM
dev * virtualbox Running tcp://192.168.99.127:2376 dev * virtualbox Running tcp://192.168.99.127:2376
$ $(docker-machine env dev) $ eval "$(docker-machine env dev)"
$ docker run busybox echo hello world $ docker run busybox echo hello world
Unable to find image 'busybox:latest' locally Unable to find image 'busybox:latest' locally
@ -35,7 +35,7 @@ INFO[0001] Creating Digital Ocean droplet...
INFO[0002] Waiting for SSH... INFO[0002] Waiting for SSH...
INFO[0070] Configuring Machine... INFO[0070] Configuring Machine...
INFO[0109] "staging" has been created and is now the active machine. INFO[0109] "staging" has been created and is now the active machine.
INFO[0109] To point your Docker client at it, run this in your shell: $(docker-machine env staging) INFO[0109] To point your Docker client at it, run this in your shell: eval "$(docker-machine env staging)"
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL SWARM NAME ACTIVE DRIVER STATE URL SWARM

2
commands.go
View File

@ -332,7 +332,7 @@ func cmdCreate(c *cli.Context) {
case "fish": case "fish":
info = fmt.Sprintf("%s env %s | source", c.App.Name, name) info = fmt.Sprintf("%s env %s | source", c.App.Name, name)
default: default:
info = fmt.Sprintf("$(%s env %s)", c.App.Name, name) info = fmt.Sprintf(`eval "$(%s env %s)"`, c.App.Name, name)
} }
log.Infof("%q has been created and is now the active machine.", name) log.Infof("%q has been created and is now the active machine.", name)

8
docs/index.md
View File

@ -273,7 +273,7 @@ $ docker-machine create -d virtualbox local
Load the Machine configuration into your shell: Load the Machine configuration into your shell:
``` ```
$ $(docker-machine env local) $ eval "$(docker-machine env local)"
``` ```
Then run generate the token using the Swarm Docker image: Then run generate the token using the Swarm Docker image:
@ -324,7 +324,7 @@ export DOCKER_HOST=tcp://192.168.99.100:3376
``` ```
You can load this into your environment using You can load this into your environment using
`$(docker-machine env --swarm swarm-master)`. `eval "$(docker-machine env --swarm swarm-master)"`.
Now you can use the Docker CLI to query: Now you can use the Docker CLI to query:
@ -389,13 +389,13 @@ run in a subshell. Running `docker-machine env -u` will print
``` ```
$ env | grep DOCKER $ env | grep DOCKER
$ $(docker-machine env dev) $ eval "$(docker-machine env dev)"
$ env | grep DOCKER $ env | grep DOCKER
DOCKER_HOST=tcp://192.168.99.101:2376 DOCKER_HOST=tcp://192.168.99.101:2376
DOCKER_CERT_PATH=/Users/nathanleclaire/.docker/machines/.client DOCKER_CERT_PATH=/Users/nathanleclaire/.docker/machines/.client
DOCKER_TLS_VERIFY=1 DOCKER_TLS_VERIFY=1
$ # If you run a docker command, now it will run against that host. $ # If you run a docker command, now it will run against that host.
$ $(docker-machine env -u) $ eval "$(docker-machine env -u)"
$ env | grep DOCKER $ env | grep DOCKER
$ # The environment variables have been unset. $ # The environment variables have been unset.
``` ```