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

rename shellinit to env 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-01-28 13:01:25 -05:00
parent 62f46b207f
commit eafc0048f0
No known key found for this signature in database
GPG Key ID: A519480096146526
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -40,6 +40,8 @@ staging * digitalocean Running tcp://104.236.37.134:2376
Machine creates Docker hosts that are secure by default. The connection between the client and daemon is encrypted and authenticated using TLS security. To get the Docker arguments for a machine use the command: `docker-machine config <machine-name>` i.e. `docker-machine config dev`. Machine creates Docker hosts that are secure by default. The connection between the client and daemon is encrypted and authenticated using TLS security. To get the Docker arguments for a machine use the command: `docker-machine config <machine-name>` i.e. `docker-machine config dev`.
You can also get the commands to export environment variables to use with the Docker CLI: `docker-machine env <machine-name>` i.e. `docker-machine env dev` to show or `$(docker-machine env dev)` to load in your environment.
## Try it out ## Try it out
Machine is still in its early stages. If you'd like to try out a preview build, [download it here](https://github.com/docker/machine/releases/latest). Machine is still in its early stages. If you'd like to try out a preview build, [download it here](https://github.com/docker/machine/releases/latest).

8
commands.go
View File

@ -129,9 +129,9 @@ var Commands = []cli.Command{
Action: cmdRm, Action: cmdRm,
}, },
{ {
Name: "shellinit", Name: "env",
Usage: "Display the shell commands to set up the Docker client", Usage: "Display the commands to set up the environment for the Docker client",
Action: cmdShellinit, Action: cmdEnv,
}, },
{ {
Flags: []cli.Flag{ Flags: []cli.Flag{
@ -337,7 +337,7 @@ func cmdRm(c *cli.Context) {
} }
} }
func cmdShellinit(c *cli.Context) { func cmdEnv(c *cli.Context) {
cfg, err := getMachineConfig(c) cfg, err := getMachineConfig(c)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)

31
docs/dockermachine.md
View File

@ -46,7 +46,7 @@ Now you should be able to check the version with `docker-machine -v`:
``` ```
$ docker-machine -v $ docker-machine -v
machine version 0.0.3 machine version 0.1.0
``` ```
## Getting started with Docker Machine using a local VM ## Getting started with Docker Machine using a local VM
@ -85,13 +85,24 @@ INFO[0038] "dev" has been created and is now the active machine
INFO[0038] To connect: docker $(docker-machine config dev) ps INFO[0038] To connect: docker $(docker-machine config dev) ps
``` ```
To use the Docker CLI, you can use the `env` command to list the commands
needed to connect to the instance.
```
$ docker-machine env dev
export DOCKER_TLS_VERIFY=yes
export DOCKER_CERT_PATH=/home/ehazlett/.docker/machines/.client
export DOCKER_HOST=tcp://192.168.99.100:2376
```
You can see the machine you have created by running the `docker-machine ls` command You can see the machine you have created by running the `docker-machine ls` command
again: again:
``` ```
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL NAME ACTIVE DRIVER STATE URL
dev * virtualbox Running tcp://192.168.99.100:2375 dev * virtualbox Running tcp://192.168.99.100:2376
``` ```
The `*` next to `dev` indicates that it is the active host. The `*` next to `dev` indicates that it is the active host.
@ -216,8 +227,8 @@ active host:
$ docker-machine active dev $ docker-machine active dev
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL NAME ACTIVE DRIVER STATE URL
dev virtualbox Running tcp://192.168.99.103:2375 dev virtualbox Running tcp://192.168.99.103:2376
staging * digitalocean Running tcp://104.236.50.118:2375 staging * digitalocean Running tcp://104.236.50.118:2376
``` ```
To select an active host, you can use the `docker-machine active` command. To select an active host, you can use the `docker-machine active` command.
@ -226,8 +237,8 @@ To select an active host, you can use the `docker-machine active` command.
$ docker-machine active dev $ docker-machine active dev
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL NAME ACTIVE DRIVER STATE URL
dev * virtualbox Running tcp://192.168.99.103:2375 dev * virtualbox Running tcp://192.168.99.103:2376
staging digitalocean Running tcp://104.236.50.118:2375 staging digitalocean Running tcp://104.236.50.118:2376
``` ```
To remove a host and all of its containers and images, use `docker-machine rm`: To remove a host and all of its containers and images, use `docker-machine rm`:
@ -260,13 +271,13 @@ Get or set the active machine.
``` ```
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL NAME ACTIVE DRIVER STATE URL
dev virtualbox Running tcp://192.168.99.103:2375 dev virtualbox Running tcp://192.168.99.103:2376
staging * digitalocean Running tcp://104.236.50.118:2375 staging * digitalocean Running tcp://104.236.50.118:2376
$ docker-machine active dev $ docker-machine active dev
$ docker-machine ls $ docker-machine ls
NAME ACTIVE DRIVER STATE URL NAME ACTIVE DRIVER STATE URL
dev * virtualbox Running tcp://192.168.99.103:2375 dev * virtualbox Running tcp://192.168.99.103:2376
staging digitalocean Running tcp://104.236.50.118:2375 staging digitalocean Running tcp://104.236.50.118:2376
``` ```
#### create #### create