Merge pull request #15514 from moxiegirl/fix-installation-images

Docker Toolbox Updates fixes #14561
2026-08-19 04:07:34 +00:00 · 2015-08-11 23:39:41 -07:00
parent e6d84bddc4 19c08cd7f4
commit e9183b35a3
15 changed files with 48 additions and 48 deletions
@@ -72,38 +72,38 @@ installer.
 and choosing "Open" from the pop-up menu.

    The installer launches the "Install Docker Toolbox" dialog.
-
+    
    ![Install Docker Toolbox](/installation/images/mac-welcome-page.png)

 4. Press "Continue" to install the toolbox.

    The installer presents you with options to customize the standard
    installation. 
-
+  
    ![Standard install](/installation/images/mac-page-two.png)
-
+  
    By default, the standard Docker Toolbox installation:
-
+  
    * installs binaries for the Docker tools in `/usr/local/bin` 
    * makes these binaries available to all users 
    * updates any existing VirtualBox installation 
-
+  
    Change these defaults by pressing "Customize" or "Change
    Install Location."  

 5. Press "Install" to perform the standard installation.

     The system prompts you for your password.
-
+   
     ![Password prompt](/installation/images/mac-password-prompt.png)
-
+   
 6. Provide your password to continue with the installation.

     When it completes, the installer provides you with some information you can
     use to complete some common tasks.
-
+   
     ![All finished](/installation/images/mac-page-finished.png)
-
+   
 7. Press "Close" to exit.


@@ -134,9 +134,9 @@ There are two ways to use the installed tools, from the Docker Quickstart Termin
    * points the terminal environment to this VM

    Once the launch completes, the Docker Quickstart Terminal reports:
-
+    
     ![All finished](/installation/images/mac-success.png)
-
+     
    Now, you can run `docker` commands. 

 3. Verify your setup succeeded by running the `hello-world` container.
@@ -186,20 +186,20 @@ different shell such as C Shell but the commands are the same.
        To see how to connect Docker to this machine, run: docker-machine env default

    This creates a new `default` in VirtualBox.
-
+    
    ![default](/installation/images/default.png)

    The command also creates a machine configuration in 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.
-
+    
 2. List your available machines.

        $ docker-machine ls
        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
        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 `default`, the `docker-machine` command provided instructions
@@ -214,7 +214,7 @@ different shell such as C Shell but the commands are the same.
        export DOCKER_MACHINE_NAME="default"
        # Run this command to configure your shell: 
        # eval "$(docker-machine env default)"
-
+    
 4. Connect your shell to the `default` machine.

        $ eval "$(docker-machine env default)"
@@ -246,9 +246,9 @@ this older VM, you can migrate it.
 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
 and what it does:
@@ -408,7 +408,7 @@ To uninstall, do the following:

        $ docker-machine rm dev
        Successfully removed dev
-
+    
     Removing a machine deletes its VM from VirtualBox and from the
     `~/.docker/machine/machines` directory.

@@ -417,7 +417,7 @@ To uninstall, do the following:
 4. Remove the `docker`, `docker-compose`, and `docker-machine` commands from the `/usr/local/bin` folder.

        $ rm /usr/local/bin/docker
-
+      
 5. Delete the `~/.docker` folder from your system.


@@ -429,4 +429,4 @@ documentation](https://docs.docker.com/machine/).

 You can continue with the [Docker User Guide](/userguide). If you are
 interested in using the Kitematic GUI, see the [Kitermatic user
-guide](/kitematic/userguide/).
+guide](/kitematic/userguide/).
@@ -36,7 +36,7 @@ Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker. Windows
 1. Right click the Windows message and choose **System**. 

    ![Which version](/installation/images/win_ver.png)
-
+    
    If you aren't using a supported version, you could consider upgrading your
    operating system.

@@ -44,19 +44,19 @@ Your machine must be running Windows 7.1, 8/8.1 or newer to run Docker. Windows

    #### For Windows 8 or 8.1

-    Choose **Start > Task Manager** and navigate to the **Performance** tab.          
-    Under **CPU** you should see the following:
+	  Choose **Start > Task Manager** and navigate to the **Performance** tab.          
+	  Under **CPU** you should see the following:

      ![Release page](/installation/images/virtualization.png)
-
+    
    If virtualization is not enabled on your system, follow the manufacturer's instructions for enabling it.
-
-    ### For Windows 7
-
-    Run the <a
-    href="http://www.microsoft.com/en-us/download/details.aspx?id=592"
-    target="_blank"> Microsoft® Hardware-Assisted Virtualization Detection
-    Tool</a> and follow the on-screen instructions.
+    
+    ### For Windows 7 
+    
+	  Run the <a
+	  href="http://www.microsoft.com/en-us/download/details.aspx?id=592"
+	  target="_blank"> Microsoft® Hardware-Assisted Virtualization Detection
+	  Tool</a> and follow the on-screen instructions.


 > **Note**: If you have Docker hosts running and you don't wish to do a Docker Toolbox
@@ -101,14 +101,14 @@ installer.
 3. Install Docker Toolbox by double-clicking the installer.

    The installer launches the "Setup - Docker Toolbox" dialog.
-
+    
    ![Install Docker Toolbox](/installation/images/win-welcome.png)

 4. Press "Next" to install the toolbox.

    The installer presents you with options to customize the standard
    installation. By default, the standard Docker Toolbox installation:
-
+  
    * installs executables for the Docker tools in `C:\Program Files\Docker Toolbox` 
    * updates any existing VirtualBox installation 
    * adds a Docker Inc. folder to your program shortcuts
@@ -120,16 +120,16 @@ installer.
 5. Press "Next" until you reach the "Ready to Install" page.

     The system prompts you for your password.
-
+   
     ![Install](/installation/images/win-page-6.png)
-
+     
 6. Press "Install"  to continue with the installation.

     When it completes, the installer provides you with some information you can
     use to complete some common tasks.
-
+   
     ![All finished](/installation/images/windows-finish.png)
-
+   
 7. Press "Close" to exit.

 ## Running a Docker Container
@@ -198,7 +198,7 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
 2. Add this to the `%PATH%` environment variable by running:

        set PATH=%PATH%;"c:\Program Files (x86)\Git\bin"
-
+        
 3. Create a new Docker VM.

        docker-machine create --driver virtualbox my-default
@@ -212,20 +212,20 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
    `C:\USERS\USERNAME\.docker\machine\machines` 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.
-
+    
 4. List your available machines.

        C:\Users\mary> docker-machine ls
        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
        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-default
-
+    
 6. Connect your shell to the `my-default` machine.

        C:\Users\mary> eval "$(docker-machine env my-default)"
@@ -241,21 +241,21 @@ There are several ways to use the installed tools, from the Docker Quickstart Te
 2. Add `ssh.exe` to your PATH:

        PS C:\Users\mary> $Env:Path = "${Env:Path};c:\Program Files (x86)\Git\bin"
-
+        
 3. Create a new 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-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-default
-
+    
 6. Connect your shell to the `my-default` machine.

        C:\Users\mary> eval "$(docker-machine env my-default)"
@@ -288,9 +288,9 @@ this older VM, you can migrate it.
 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
 and what it does:
@@ -362,4 +362,4 @@ delete that file yourself.

 You can continue with the [Docker User Guide](/userguide). If you are
 interested in using the Kitematic GUI, see the [Kitermatic user
-guide](/kitematic/userguide/).
+guide](/kitematic/userguide/).