Skip to content

Commit e5c160e

Browse files
author
Mary Anthony
committed
Updating new vm and with migrate
Signed-off-by: Mary Anthony <[email protected]>
1 parent 0bfad28 commit e5c160e

2 files changed

Lines changed: 61 additions & 37 deletions

File tree

‎docs/installation/mac.md‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Docker container using standard localhost addressing such as `localhost:8000` or
4747
![Linux Architecture Diagram](/installation/images/linux_docker_host.svg)
4848

4949
In an OS X installation, the `docker` daemon is running inside a Linux VM called
50-
`docker-vm`. The `docker-vm` is a lightweight Linux VM made specifically to run
50+
`default`. The `default` is a lightweight Linux VM made specifically to run
5151
the Docker daemon on Mac OS X. The VM runs completely from RAM, is a small ~24MB
5252
download, and boots in approximately 5s.
5353

@@ -130,7 +130,7 @@ There are two ways to use the installed tools, from the Docker Quickstart Termin
130130
The application:
131131

132132
* opens a terminal window
133-
* creates a VM called `docker-vm` if it doesn't exists, starts the VM if it does
133+
* creates a VM called `default` if it doesn't exists, starts the VM if it does
134134
* points the terminal environment to this VM
135135

136136
Once the launch completes, the Docker Quickstart Terminal reports:
@@ -178,46 +178,46 @@ different shell such as C Shell but the commands are the same.
178178

179179
1. Create a new Docker VM.
180180

181-
$ docker-machine create --driver virtualbox docker-vm
181+
$ docker-machine create --driver virtualbox default
182182
Creating VirtualBox VM...
183183
Creating SSH key...
184184
Starting VirtualBox VM...
185185
Starting VM...
186-
To see how to connect Docker to this machine, run: docker-machine env docker-vm
186+
To see how to connect Docker to this machine, run: docker-machine env default
187187

188-
This creates a new `docker-vm` in VirtualBox.
188+
This creates a new `default` in VirtualBox.
189189

190-
![docker-vm](/installation/images/docker-vm.png)
190+
![default](/installation/images/default.png)
191191

192192
The command also creates a machine configuration in the
193-
`~/.docker/machine/machines/docker-vm` directory. You only need to run the
193+
`~/.docker/machine/machines/default` directory. You only need to run the
194194
`create` command once. Then, you can use `docker-machine` to start, stop,
195195
query, and otherwise manage the VM from the command line.
196196

197197
2. List your available machines.
198198

199199
$ docker-machine ls
200200
NAME ACTIVE DRIVER STATE URL SWARM
201-
docker-vm * virtualbox Running tcp://192.168.99.101:2376
201+
default * virtualbox Running tcp://192.168.99.101:2376
202202
203203
If you have previously installed the deprecated Boot2Docker application or
204204
run the Docker Quickstart Terminal, you may have a `dev` VM as well. When you
205-
created `docker-vm`, the `docker-machine` command provided instructions
205+
created `default`, the `docker-machine` command provided instructions
206206
for learning how to connect the VM.
207207

208208
3. Get the environment commands for your new VM.
209209

210-
$ docker-machine env docker-vm
210+
$ docker-machine env default
211211
export DOCKER_TLS_VERIFY="1"
212212
export DOCKER_HOST="tcp://192.168.99.101:2376"
213-
export DOCKER_CERT_PATH="/Users/mary/.docker/machine/machines/docker-vm"
214-
export DOCKER_MACHINE_NAME="docker-vm"
213+
export DOCKER_CERT_PATH="/Users/mary/.docker/machine/machines/default"
214+
export DOCKER_MACHINE_NAME="default"
215215
# Run this command to configure your shell:
216-
# eval "$(docker-machine env docker-vm)"
216+
# eval "$(docker-machine env default)"
217217

218-
4. Connect your shell to the `docker-vm` machine.
218+
4. Connect your shell to the `default` machine.
219219

220-
$ eval "$(docker-machine env docker-vm)"
220+
$ eval "$(docker-machine env default)"
221221

222222
5. Run the `hello-world` container to verify your setup.
223223

@@ -227,13 +227,27 @@ different shell such as C Shell but the commands are the same.
227227
## Learn about your Toolbox installation
228228

229229
Toolbox installs the Docker Engine binary, the Docker binary on your system. When you
230-
use the Docker Quickstart Terminal or create a `docker-vm` manually, Docker
231-
Machine updates the `~/.docker/machine/machines/docker-vm` folder to your
230+
use the Docker Quickstart Terminal or create a `default` manually, Docker
231+
Machine updates the `~/.docker/machine/machines/default` folder to your
232232
system. This folder contains the configuration for the VM.
233233

234234
You can create multiple VMs on your system with Docker Machine. So, you may have
235235
more than one VM folder if you have more than one VM. To remove a VM, use the
236236
`docker-machine rm <machine-name>` command.
237+
238+
## Migrate from Boot2Docker
239+
240+
If you were using Boot2Docker previously, you have a pre-existing Docker
241+
`boot2docker-vm` VM on your local system. To allow Docker Machine to manage
242+
this older VM, you can migrate it.
243+
244+
1. Open a terminal or the Docker CLI on your system.
245+
246+
2. Type the following command.
247+
248+
$ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
249+
250+
3. Use the `docker-machine` command to interact with the migrated VM.
237251

238252
The `docker-machine` subcommands are slightly different than the `boot2docker`
239253
subcommands. The table below lists the equivalent `docker-machine` subcommand
@@ -388,7 +402,7 @@ To uninstall, do the following:
388402
NAME ACTIVE DRIVER STATE URL SWARM
389403
dev * virtualbox Running tcp://192.168.99.100:2376
390404
my-docker-machine virtualbox Stopped
391-
docker-vm virtualbox Stopped
405+
default virtualbox Stopped
392406

393407
2. Remove each machine.
394408

‎docs/installation/windows.md‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ The Docker VM is lightweight Linux virtual machine made specifically to run the
2929
Docker daemon on Windows. The VirtualBox VM runs completely from RAM, is a
3030
small ~24MB download, and boots in approximately 5s.
3131

32-
33-
3432
## Requirements
3533

36-
Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker.
37-
To find out what version of Windows you have:
34+
Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker. Windows 10 is not currently supported. To find out what version of Windows you have:
3835

3936
1. Right click the Windows message and choose **System**.
4037

@@ -135,7 +132,6 @@ installer.
135132

136133
7. Press "Close" to exit.
137134

138-
139135
## Running a Docker Container
140136

141137
To run a Docker container, you:
@@ -157,7 +153,7 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
157153
The application:
158154

159155
* opens a terminal window
160-
* creates a `docker-vm` if it doesn't exist, starts the VM if it does
156+
* creates a `default` if it doesn't exist, starts the VM if it does
161157
* points the terminal environment to this VM
162158

163159
Once the launch completes, you can run `docker` commands.
@@ -205,12 +201,12 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
205201
206202
3. Create a new Docker VM.
207203

208-
docker-machine create --driver virtualbox my-docker-vm
204+
docker-machine create --driver virtualbox my-default
209205
Creating VirtualBox VM...
210206
Creating SSH key...
211207
Starting VirtualBox VM...
212208
Starting VM...
213-
To see how to connect Docker to this machine, run: docker-machine env my-docker-vm
209+
To see how to connect Docker to this machine, run: docker-machine env my-default
214210

215211
The command also creates a machine configuration in the
216212
`C:\USERS\USERNAME\.docker\machine\machines` directory. You only need to run the `create`
@@ -221,18 +217,18 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
221217

222218
C:\Users\mary> docker-machine ls
223219
NAME ACTIVE DRIVER STATE URL SWARM
224-
my-docker-vm * virtualbox Running tcp://192.168.99.101:2376
220+
my-default * virtualbox Running tcp://192.168.99.101:2376
225221
226222
If you have previously installed the deprecated Boot2Docker application or
227223
run the Docker Quickstart Terminal, you may have a `dev` VM as well.
228224

229225
5. Get the environment commands for your new VM.
230226

231-
C:\Users\mary> docker-machine env --shell cmd my-docker-vm
227+
C:\Users\mary> docker-machine env --shell cmd my-default
232228

233-
6. Connect your shell to the `my-docker-vm` machine.
229+
6. Connect your shell to the `my-default` machine.
234230

235-
C:\Users\mary> eval "$(docker-machine env my-docker-vm)"
231+
C:\Users\mary> eval "$(docker-machine env my-default)"
236232

237233
7. Run the `hello-world` container to verify your setup.
238234

@@ -248,21 +244,21 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
248244
249245
3. Create a new Docker VM.
250246

251-
PS C:\Users\mary> docker-machine create --driver virtualbox my-docker-vm
247+
PS C:\Users\mary> docker-machine create --driver virtualbox my-default
252248

253249
4. List your available machines.
254250

255251
C:\Users\mary> docker-machine ls
256252
NAME ACTIVE DRIVER STATE URL SWARM
257-
my-docker-vm * virtualbox Running tcp://192.168.99.101:2376
253+
my-default * virtualbox Running tcp://192.168.99.101:2376
258254
259255
5. Get the environment commands for your new VM.
260256

261-
C:\Users\mary> docker-machine env --shell powershell my-docker-vm
257+
C:\Users\mary> docker-machine env --shell powershell my-default
262258

263-
6. Connect your shell to the `my-docker-vm` machine.
259+
6. Connect your shell to the `my-default` machine.
264260

265-
C:\Users\mary> eval "$(docker-machine env my-docker-vm)"
261+
C:\Users\mary> eval "$(docker-machine env my-default)"
266262

267263
7. Run the `hello-world` container to verify your setup.
268264

@@ -273,13 +269,27 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
273269

274270
Toolbox installs the Docker Engine binary in the `C:\Program Files\Docker
275271
Toolbox` directory. When you use the Docker Quickstart Terminal or create a
276-
`docker-vm` manually, Docker Machine updates the
277-
`C:\USERS\USERNAME\.docker\machine\machines\docker-vm` folder to your
272+
`default` manually, Docker Machine updates the
273+
`C:\USERS\USERNAME\.docker\machine\machines\default` folder to your
278274
system. This folder contains the configuration for the VM.
279275

280276
You can create multiple VMs on your system with Docker Machine. So, you may have
281277
more than one VM folder if you have more than one VM. To remove a VM, use the
282278
`docker-machine rm <machine-name>` command.
279+
280+
## Migrate from Boot2Docker
281+
282+
If you were using Boot2Docker previously, you have a pre-existing Docker
283+
`boot2docker-vm` VM on your local system. To allow Docker Machine to manage
284+
this older VM, you can migrate it.
285+
286+
1. Open a terminal or the Docker CLI on your system.
287+
288+
2. Type the following command.
289+
290+
$ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
291+
292+
3. Use the `docker-machine` command to interact with the migrated VM.
283293

284294
The `docker-machine` subcommands are slightly different than the `boot2docker`
285295
subcommands. The table below lists the equivalent `docker-machine` subcommand

0 commit comments

Comments
 (0)