diff --git a/docs/sources/installation/images/win/_01.gif b/docs/sources/installation/images/win/_01.gif deleted file mode 100644 index fbfc0a3028..0000000000 Binary files a/docs/sources/installation/images/win/_01.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/_02.gif b/docs/sources/installation/images/win/_02.gif deleted file mode 100644 index 16d8a688ff..0000000000 Binary files a/docs/sources/installation/images/win/_02.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/_06.gif b/docs/sources/installation/images/win/_06.gif deleted file mode 100644 index d935c02ae9..0000000000 Binary files a/docs/sources/installation/images/win/_06.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/cygwin.gif b/docs/sources/installation/images/win/cygwin.gif deleted file mode 100644 index d00445486e..0000000000 Binary files a/docs/sources/installation/images/win/cygwin.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/hp_bios_vm.JPG b/docs/sources/installation/images/win/hp_bios_vm.JPG deleted file mode 100644 index 468d95ef5a..0000000000 Binary files a/docs/sources/installation/images/win/hp_bios_vm.JPG and /dev/null differ diff --git a/docs/sources/installation/images/win/putty.gif b/docs/sources/installation/images/win/putty.gif deleted file mode 100644 index e7d418d2de..0000000000 Binary files a/docs/sources/installation/images/win/putty.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/putty_2.gif b/docs/sources/installation/images/win/putty_2.gif deleted file mode 100644 index 053ad231fc..0000000000 Binary files a/docs/sources/installation/images/win/putty_2.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/run_02_.gif b/docs/sources/installation/images/win/run_02_.gif deleted file mode 100644 index 4243bf6186..0000000000 Binary files a/docs/sources/installation/images/win/run_02_.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/run_03.gif b/docs/sources/installation/images/win/run_03.gif deleted file mode 100644 index c1f620a3c3..0000000000 Binary files a/docs/sources/installation/images/win/run_03.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/run_04.gif b/docs/sources/installation/images/win/run_04.gif deleted file mode 100644 index 75092762fc..0000000000 Binary files a/docs/sources/installation/images/win/run_04.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/ssh-config.gif b/docs/sources/installation/images/win/ssh-config.gif deleted file mode 100644 index 4fd3b2b333..0000000000 Binary files a/docs/sources/installation/images/win/ssh-config.gif and /dev/null differ diff --git a/docs/sources/installation/images/win/ts_go_bios.JPG b/docs/sources/installation/images/win/ts_go_bios.JPG deleted file mode 100644 index c4159fc715..0000000000 Binary files a/docs/sources/installation/images/win/ts_go_bios.JPG and /dev/null differ diff --git a/docs/sources/installation/images/win/ts_no_docker.JPG b/docs/sources/installation/images/win/ts_no_docker.JPG deleted file mode 100644 index 9ccba01c1e..0000000000 Binary files a/docs/sources/installation/images/win/ts_no_docker.JPG and /dev/null differ diff --git a/docs/sources/installation/images/windows-boot2docker-cmd.png b/docs/sources/installation/images/windows-boot2docker-cmd.png new file mode 100644 index 0000000000..09e3206ef9 Binary files /dev/null and b/docs/sources/installation/images/windows-boot2docker-cmd.png differ diff --git a/docs/sources/installation/images/windows-boot2docker-powershell.png b/docs/sources/installation/images/windows-boot2docker-powershell.png new file mode 100644 index 0000000000..b1ef896726 Binary files /dev/null and b/docs/sources/installation/images/windows-boot2docker-powershell.png differ diff --git a/docs/sources/installation/images/windows-boot2docker-start.png b/docs/sources/installation/images/windows-boot2docker-start.png index 9d598d56bf..5e3563b7d5 100644 Binary files a/docs/sources/installation/images/windows-boot2docker-start.png and b/docs/sources/installation/images/windows-boot2docker-start.png differ diff --git a/docs/sources/installation/images/windows-installer.png b/docs/sources/installation/images/windows-installer.png index ea1d3d2326..7580ed6226 100644 Binary files a/docs/sources/installation/images/windows-installer.png and b/docs/sources/installation/images/windows-installer.png differ diff --git a/docs/sources/installation/windows.md b/docs/sources/installation/windows.md index 26b2a42a45..95e5906cfd 100644 --- a/docs/sources/installation/windows.md +++ b/docs/sources/installation/windows.md @@ -8,12 +8,17 @@ page_keywords: Docker, Docker documentation, Windows, requirements, virtualbox, > Your processor needs to support hardware virtualization. The Docker Engine uses Linux-specific kernel features, so to run it on Windows -we need to use a lightweight virtual machine (vm). You use the Windows Docker client to -control the virtualized Docker Engine to build, run, and manage Docker containers. +we need to use a lightweight virtual machine (VM). You use the **Windows Docker +Client** to control the virtualized Docker Engine to build, run, and manage +Docker containers. To make this process easier, we've designed a helper application called -[Boot2Docker](https://github.com/boot2docker/boot2docker) that installs the -virtual machine and runs the Docker daemon. +[Boot2Docker](https://github.com/boot2docker/boot2docker) creates a Linux virtual +machine on Windows to run Docker on a Linux operating system. + +Although you will be using Windows Docker client, the docker engine hosting the +containers will still be running on Linux. Until the Docker engine for Windows +is developed, you can launch only Linux containers from your Windows machine. ## Demonstration @@ -21,18 +26,77 @@ virtual machine and runs the Docker daemon. ## Installation -1. Download the latest release of the [Docker for Windows Installer](https://github.com/boot2docker/windows-installer/releases/latest) -2. Run the installer, which will install VirtualBox, MSYS-git, the boot2docker Linux ISO, -and the Boot2Docker management tool. +1. Download the latest release of the + [Docker for Windows Installer](https://github.com/boot2docker/windows-installer/releases/latest). +2. Run the installer, which will install Docker Client or Windows, VirtualBox, + Git for Windows (MSYS-git), the boot2docker Linux ISO, and the Boot2Docker + management tool. ![](/installation/images/windows-installer.png) -3. Run the `Boot2Docker Start` shell script from your Desktop or Program Files > Boot2Docker for Windows. +3. Run the **Boot2Docker Start** shortcut from your Desktop or “Program Files → + Boot2Docker for Windows”. The Start script will ask you to enter an ssh key passphrase - the simplest (but least secure) is to just hit [Enter]. - ![](/installation/images/windows-boot2docker-start.png) +4. The **Boot2Docker Start** will start a unix shell already configured to manage + Docker running inside the virtual machine. Run `docker version` to see + if it is working correctly: - The `Boot2Docker Start` script will connect you to a shell session in the virtual - machine. If needed, it will initialize a new VM and start it. +![](/installation/images/windows-boot2docker-start.png) + +## Running Docker + +{{ include "no-remote-sudo.md" }} + +**Boot2Docker Start** will automatically start a shell with environment variables +correctly set so you can start using Docker right away: + +Let's try the `hello-world` example image. Run + + $ docker run hello-world + +This should download the very small `hello-world` image and print a +`Hello from Docker.` message. + +## Using docker from Windows Command Line Prompt (cmd.exe) + +Launch a Windows Command Line Prompt (cmd.exe). + +Boot2Docker command requires `ssh.exe` to be in the PATH, therefore we need to +include `bin` folder of the Git installation (which has ssh.exe) to the `%PATH%` +environment variable by running: + + set PATH=%PATH%;"c:\Program Files (x86)\Git\bin" + +and then we can run the `boot2docker start` command to start the Boot2Docker VM. +(Run `boot2docker init` command if you get an error saying machine does not +exist.) Then copy the instructions for cmd.exe to set the environment variables +to your console window and you are ready to run docker commands such as +`docker ps`: + +![](/installation/images/windows-boot2docker-cmd.png) + +## Using docker from PowerShell + +Launch a PowerShell window, then you need to add `ssh.exe` to your PATH: + + $Env:Path = "${Env:Path};c:\Program Files (x86)\Git\bin" + +and after running `boot2docker start` command it will print PowerShell commands +to set the environment variables to connect Docker running inside VM. Run these +commands and you are ready to run docker commands such as `docker ps`: + +![](/installation/images/windows-boot2docker-powershell.png) + +> NOTE: You can alternatively run `boot2docker shellinit | Invoke-Expression` +> command to set the environment variables instead of copying and pasting on +> PowerShell. + +# Further Details + +The Boot2Docker management tool provides several commands: + + $ boot2docker + Usage: boot2docker.exe [] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|shellinit|delete|download|upgrade|version} [] ## Upgrading @@ -47,46 +111,13 @@ and the Boot2Docker management tool. boot2docker download boot2docker start -## Running Docker - -{{ include "no-remote-sudo.md" }} - -Boot2Docker will log you in automatically so you can start using Docker right away. - -Let's try the `hello-world` example image. Run - - $ docker run hello-world - -This should download the very small `hello-world` image and print a `Hello from Docker.` message. - -## Login with PUTTY instead of using the CMD - -Boot2Docker generates and uses the public/private key pair in your `%HOMEPATH%\.ssh` -directory so to log in you need to use the private key from this same directory. - -The private key needs to be converted into the format PuTTY uses. - -You can do this with -[puttygen](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html): - -- Open `puttygen.exe` and load ("File"->"Load" menu) the private key from - `%HOMEPATH%\.ssh\id_boot2docker` -- then click: "Save Private Key". -- Then use the saved file to login with PuTTY using `docker@127.0.0.1:2022`. - -# Further Details - -The Boot2Docker management tool provides several commands: - - $ ./boot2docker - Usage: ./boot2docker [] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|delete|download|version} [] - - ## Container port redirection -If you are curious, the username for the boot2docker default user is `docker` and the password is `tcuser`. +If you are curious, the username for the boot2docker default user is `docker` +and the password is `tcuser`. -The latest version of `boot2docker` sets up a host only network adaptor which provides access to the container's ports. +The latest version of `boot2docker` sets up a host only network adaptor which +provides access to the container's ports. If you run a container with an exposed port: @@ -101,3 +132,18 @@ Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP implementation. For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io) + +## Login with PUTTY instead of using the CMD + +Boot2Docker generates and uses the public/private key pair in your `%USERPROFILE%\.ssh` +directory so to log in you need to use the private key from this same directory. + +The private key needs to be converted into the format PuTTY uses. + +You can do this with +[puttygen](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html): + +- Open `puttygen.exe` and load ("File"->"Load" menu) the private key from + `%USERPROFILE%\.ssh\id_boot2docker` +- then click: "Save Private Key". +- Then use the saved file to login with PuTTY using `docker@127.0.0.1:2022`.