From e5c160e1d68fa7ed485827a88a577b9fff2077c7 Mon Sep 17 00:00:00 2001
From: Mary Anthony <mary@docker.com>
Date: Mon, 10 Aug 2015 13:29:08 -0700
Subject: [PATCH] Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
---
docs/installation/mac.md | 50 +++++++++++++++++++++++-------------
docs/installation/windows.md | 48 ++++++++++++++++++++--------------
2 files changed, 61 insertions(+), 37 deletions(-)
diff --git a/docs/installation/mac.md b/docs/installation/mac.md
index bc89b68fea..0a4b303fc5 100644
--- a/docs/installation/mac.md
+++ b/docs/installation/mac.md
@@ -47,7 +47,7 @@ Docker container using standard localhost addressing such as `localhost:8000` or
In an OS X installation, the `docker` daemon is running inside a Linux VM called
-`docker-vm`. The `docker-vm` is a lightweight Linux VM made specifically to run
+`default`. The `default` is a lightweight Linux VM made specifically to run
the Docker daemon on Mac OS X. The VM runs completely from RAM, is a small ~24MB
download, and boots in approximately 5s.
@@ -130,7 +130,7 @@ There are two ways to use the installed tools, from the Docker Quickstart Termin
The application:
* opens a terminal window
- * creates a VM called `docker-vm` if it doesn't exists, starts the VM if it does
+ * creates a VM called `default` if it doesn't exists, starts the VM if it does
* points the terminal environment to this VM
Once the launch completes, the Docker Quickstart Terminal reports:
@@ -178,19 +178,19 @@ different shell such as C Shell but the commands are the same.
1. Create a new Docker VM.
- $ docker-machine create --driver virtualbox docker-vm
+ $ docker-machine create --driver virtualbox default
Creating VirtualBox VM...
Creating SSH key...
Starting VirtualBox VM...
Starting VM...
- To see how to connect Docker to this machine, run: docker-machine env docker-vm
+ To see how to connect Docker to this machine, run: docker-machine env default
- This creates a new `docker-vm` in VirtualBox.
+ This creates a new `default` in VirtualBox.
- 
+ 
The command also creates a machine configuration in the
- `~/.docker/machine/machines/docker-vm` directory. You only need to run the
+ `~/.docker/machine/machines/default` directory. You only need to run the
`create` command once. Then, you can use `docker-machine` to start, stop,
query, and otherwise manage the VM from the command line.
@@ -198,26 +198,26 @@ different shell such as C Shell but the commands are the same.
$ docker-machine ls
NAME ACTIVE DRIVER STATE URL SWARM
- docker-vm * virtualbox Running tcp://192.168.99.101:2376
+ default * virtualbox Running tcp://192.168.99.101:2376
If you have previously installed the deprecated Boot2Docker application or
run the Docker Quickstart Terminal, you may have a `dev` VM as well. When you
- created `docker-vm`, the `docker-machine` command provided instructions
+ created `default`, the `docker-machine` command provided instructions
for learning how to connect the VM.
3. Get the environment commands for your new VM.
- $ docker-machine env docker-vm
+ $ docker-machine env default
export DOCKER_TLS_VERIFY="1"
export DOCKER_HOST="tcp://192.168.99.101:2376"
- export DOCKER_CERT_PATH="/Users/mary/.docker/machine/machines/docker-vm"
- export DOCKER_MACHINE_NAME="docker-vm"
+ export DOCKER_CERT_PATH="/Users/mary/.docker/machine/machines/default"
+ export DOCKER_MACHINE_NAME="default"
# Run this command to configure your shell:
- # eval "$(docker-machine env docker-vm)"
+ # eval "$(docker-machine env default)"
-4. Connect your shell to the `docker-vm` machine.
+4. Connect your shell to the `default` machine.
- $ eval "$(docker-machine env docker-vm)"
+ $ eval "$(docker-machine env default)"
5. Run the `hello-world` container to verify your setup.
@@ -227,13 +227,27 @@ different shell such as C Shell but the commands are the same.
## Learn about your Toolbox installation
Toolbox installs the Docker Engine binary, the Docker binary on your system. When you
-use the Docker Quickstart Terminal or create a `docker-vm` manually, Docker
-Machine updates the `~/.docker/machine/machines/docker-vm` folder to your
+use the Docker Quickstart Terminal or create a `default` manually, Docker
+Machine updates the `~/.docker/machine/machines/default` folder to your
system. This folder contains the configuration for the VM.
You can create multiple VMs on your system with Docker Machine. So, you may have
more than one VM folder if you have more than one VM. To remove a VM, use the
`docker-machine rm <machine-name>` command.
+
+## Migrate from Boot2Docker
+
+If you were using Boot2Docker previously, you have a pre-existing Docker
+`boot2docker-vm` VM on your local system. To allow Docker Machine to manage
+this older VM, you can migrate it.
+
+1. Open a terminal or the Docker CLI on your system.
+
+2. Type the following command.
+
+ $ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
+
+3. Use the `docker-machine` command to interact with the migrated VM.
The `docker-machine` subcommands are slightly different than the `boot2docker`
subcommands. The table below lists the equivalent `docker-machine` subcommand
@@ -388,7 +402,7 @@ To uninstall, do the following:
NAME ACTIVE DRIVER STATE URL SWARM
dev * virtualbox Running tcp://192.168.99.100:2376
my-docker-machine virtualbox Stopped
- docker-vm virtualbox Stopped
+ default virtualbox Stopped
2. Remove each machine.
diff --git a/docs/installation/windows.md b/docs/installation/windows.md
index 683be143df..3e118fc461 100644
--- a/docs/installation/windows.md
+++ b/docs/installation/windows.md
@@ -29,12 +29,9 @@ The Docker VM is lightweight Linux virtual machine made specifically to run the
Docker daemon on Windows. The VirtualBox VM runs completely from RAM, is a
small ~24MB download, and boots in approximately 5s.
-
-
## Requirements
-Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker.
-To find out what version of Windows you have:
+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:
1. Right click the Windows message and choose **System**.
@@ -135,7 +132,6 @@ installer.
7. Press "Close" to exit.
-
## Running a Docker Container
To run a Docker container, you:
@@ -157,7 +153,7 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
The application:
* opens a terminal window
- * creates a `docker-vm` if it doesn't exist, starts the VM if it does
+ * creates a `default` if it doesn't exist, starts the VM if it does
* points the terminal environment to this VM
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
3. Create a new Docker VM.
- docker-machine create --driver virtualbox my-docker-vm
+ docker-machine create --driver virtualbox my-default
Creating VirtualBox VM...
Creating SSH key...
Starting VirtualBox VM...
Starting VM...
- To see how to connect Docker to this machine, run: docker-machine env my-docker-vm
+ To see how to connect Docker to this machine, run: docker-machine env my-default
The command also creates a machine configuration in the
`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
C:\Users\mary> docker-machine ls
NAME ACTIVE DRIVER STATE URL SWARM
- my-docker-vm * virtualbox Running tcp://192.168.99.101:2376
+ my-default * virtualbox Running tcp://192.168.99.101:2376
If you have previously installed the deprecated Boot2Docker application or
run the Docker Quickstart Terminal, you may have a `dev` VM as well.
5. Get the environment commands for your new VM.
- C:\Users\mary> docker-machine env --shell cmd my-docker-vm
+ C:\Users\mary> docker-machine env --shell cmd my-default
-6. Connect your shell to the `my-docker-vm` machine.
+6. Connect your shell to the `my-default` machine.
- C:\Users\mary> eval "$(docker-machine env my-docker-vm)"
+ C:\Users\mary> eval "$(docker-machine env my-default)"
7. Run the `hello-world` container to verify your setup.
@@ -248,21 +244,21 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
3. Create a new Docker VM.
- PS C:\Users\mary> docker-machine create --driver virtualbox my-docker-vm
+ PS C:\Users\mary> docker-machine create --driver virtualbox my-default
4. List your available machines.
C:\Users\mary> docker-machine ls
NAME ACTIVE DRIVER STATE URL SWARM
- my-docker-vm * virtualbox Running tcp://192.168.99.101:2376
+ my-default * virtualbox Running tcp://192.168.99.101:2376
5. Get the environment commands for your new VM.
- C:\Users\mary> docker-machine env --shell powershell my-docker-vm
+ C:\Users\mary> docker-machine env --shell powershell my-default
-6. Connect your shell to the `my-docker-vm` machine.
+6. Connect your shell to the `my-default` machine.
- C:\Users\mary> eval "$(docker-machine env my-docker-vm)"
+ C:\Users\mary> eval "$(docker-machine env my-default)"
7. Run the `hello-world` container to verify your setup.
@@ -273,13 +269,27 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
Toolbox installs the Docker Engine binary in the `C:\Program Files\Docker
Toolbox` directory. When you use the Docker Quickstart Terminal or create a
-`docker-vm` manually, Docker Machine updates the
-`C:\USERS\USERNAME\.docker\machine\machines\docker-vm` folder to your
+`default` manually, Docker Machine updates the
+`C:\USERS\USERNAME\.docker\machine\machines\default` folder to your
system. This folder contains the configuration for the VM.
You can create multiple VMs on your system with Docker Machine. So, you may have
more than one VM folder if you have more than one VM. To remove a VM, use the
`docker-machine rm <machine-name>` command.
+
+## Migrate from Boot2Docker
+
+If you were using Boot2Docker previously, you have a pre-existing Docker
+`boot2docker-vm` VM on your local system. To allow Docker Machine to manage
+this older VM, you can migrate it.
+
+1. Open a terminal or the Docker CLI on your system.
+
+2. Type the following command.
+
+ $ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
+
+3. Use the `docker-machine` command to interact with the migrated VM.
The `docker-machine` subcommands are slightly different than the `boot2docker`
subcommands. The table below lists the equivalent `docker-machine` subcommand