Browse code

install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's

fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 5bc730eda76351ab669a60a5fc95fd273e399d88)

Victoria Bialas authored on 2016/06/17 14:29:56
Showing 21 changed files
... ...
@@ -10,15 +10,30 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_all"
13
-parent = "engine_use"
14
-weight="-80"
13
+parent = "tutorial_getstart_menu"
14
+weight="-1"
15 15
 +++
16 16
 <![end-metadata]-->
17 17
 
18 18
 
19 19
 # Get Started with Docker
20 20
 
21
-This tutorial is a for non-technical users who are interested in learning more about Docker. By following these steps, you'll learn fundamental Docker features while working through some simple tasks. You'll learn how to:
21
+This tutorial is a for non-technical users who are interested in learning more about Docker. By following these steps, you'll learn fundamental Docker features while working through some simple tasks.
22
+
23
+Depending on how you got here, you may or may not have already downloaded Docker for your platform and installed it.
24
+
25
+## Got Docker?
26
+
27
+If you haven't yet downloaded Docker for your platform or installed it, go to [Get Docker](step_one.md#step-1-get-docker).
28
+
29
+## Ready to start working with Docker?
30
+
31
+If you have already downloaded and installed Docker, you are ready to run Docker commands! Go to [Verify your installation](step_one.md#step-3-verify-your-installation).
32
+
33
+
34
+### What you'll learn and do
35
+
36
+You'll learn how to:
22 37
 
23 38
 * install Docker software for your platform
24 39
 * run a software image in a container
... ...
@@ -30,10 +45,17 @@ This tutorial is a for non-technical users who are interested in learning more a
30 30
 
31 31
 The getting started was user tested to reduce the chance of users having problems. For the best chance of success, follow the steps as written the first time before exploring on your own. It takes approximately 45 minutes to complete.
32 32
 
33
+## Flavors of Docker
34
+
35
+This tutorial is designed as a getting started with Docker, and works the same whether you are using Docker for Mac, Docker for Windows, Docker on Linux, or Docker Toolbox (for older Mac and Windows systems).
36
+
37
+If you are using Docker Toolbox, you can use the Docker Quickstart Terminal to run Docker commands in a pre-configured environment instead of opening a command line terminal.
38
+
39
+If you are using Docker for Mac, Docker for Windows, or Docker on Linux, you will have Docker running in the background, and your standard command line terminal is already set up to run Docker commands.
33 40
 
34
-### Make sure you understand...
41
+## How much command line savvy do I need?
35 42
 
36
-This getting started uses Docker Engine CLI commands entered on the command line of a terminal window. You don't need to be a wizard at the command line, but you should be familiar with how to open your favorite shell or terminal, and run basic commands in that environment. It helps (but isn't required) to know how to navigate a directory tree, manipulate files, list running process, and so forth.
43
+The getting started tour uses Docker Engine CLI commands entered on the command line of a terminal window. You don't need to be a wizard at the command line, but you should be familiar with how to open your favorite shell or terminal, and run basic commands in that environment. It helps (but isn't required) to know how to navigate a directory tree, manipulate files, list running process, and so forth.
37 44
 
38 45
 
39 46
 Go to [the next page to install](step_one.md).
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_learn_more"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 7
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -33,8 +33,8 @@ Depending on your interest, the Docker documentation contains a wealth of inform
33 33
     <td class="tg-031e">[Getting Started with Docker for Mac](/docker-for-mac/index.md)</td>
34 34
   </tr>
35 35
   <tr>
36
-    <td class="tg-031e">More about Docker for Windows, More about Docker for Windows, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
37
-    <td class="tg-031e">[Getting Started with Docker for Windows](/docker-for-mac/index.md)</td>
36
+    <td class="tg-031e">More about Docker for Windows, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
37
+    <td class="tg-031e">[Getting Started with Docker for Windows](/docker-for-windows/index.md)</td>
38 38
   </tr>
39 39
   <tr>
40 40
     <td class="tg-031e">More about Docker Toolbox</td>
... ...
@@ -5,7 +5,7 @@ title = "Install Docker and run hello-world"
5 5
 description = "Getting started with Docker"
6 6
 keywords = ["beginner, getting started, Docker, install"]
7 7
 identifier = "getstart_linux_install"
8
-parent = "getstart_all"
8
+parent = "tutorial_getstart_menu"
9 9
 weight="-80"
10 10
 +++
11 11
 <![end-metadata]-->
12 12
new file mode 100644
... ...
@@ -0,0 +1,16 @@
0
+<!--[metadata]>
1
+aliases = [
2
+]
3
+title = "Get Started with Docker"
4
+description = "Docker Mac"
5
+keywords = ["beginner, getting started, Docker"]
6
+type = "menu"
7
+[menu.main]
8
+identifier = "tutorial_getstart_menu"
9
+parent = "engine_use"
10
+weight = -80
11
+<![end-metadata]-->
12
+
13
+# Get Started with Docker
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_docker_hub"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 5
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_build_image"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 4
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -10,13 +10,17 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker, install"]
11 11
 [menu.main]
12 12
 identifier = "getstart_all_install"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 1
15 15
 +++
16 16
 <![end-metadata]-->
17 17
 
18 18
 # Install Docker
19 19
 
20
+- [Step 1: Get Docker](#step-1-get-docker)
21
+- [Step 2: Install Docker](#step-2-install-docker)
22
+- [Step 3: Verify your installation](#step-3-verify-your-installation)
23
+
20 24
 ## Step 1: Get Docker
21 25
 
22 26
 ### Docker for Mac
... ...
@@ -25,7 +29,7 @@ Docker for Mac is our newest offering for the Mac. It runs as a native Mac appli
25 25
 
26 26
 <a class="button" href="https://download.docker.com/mac/beta/Docker.dmg">Get Docker for Mac</a>
27 27
 
28
-#### Install Prequisites
28
+**Requirements**
29 29
 
30 30
 - Mac must be a 2010 or newer model, with Intel's hardware support for memory management unit (MMU) virtualization; i.e., Extended Page Tables (EPT)
31 31
 
... ...
@@ -47,7 +51,7 @@ Docker for Windows is our newest offering for PCs. It runs as a native Windows a
47 47
 
48 48
 <a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a>
49 49
 
50
-#### Install Prequisites
50
+**Requirements**
51 51
 
52 52
 * 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10.
53 53
 
... ...
@@ -66,21 +70,19 @@ For full instructions on getting Docker for various Linux distributions, see [In
66 66
 
67 67
 ## Step 2: Install Docker
68 68
 
69
-* For install instructions for Docker for Mac, see [Getting Started with Docker for Mac](/docker-for-mac/index.md).
70
-
71
-* For install instructions for Docker for Windows, see [Getting Started with Docker for Windows](/docker-for-windows/index.md).
69
+- **Docker for Mac** - Install instructions are at [Getting Started with Docker for Mac](/docker-for-mac/index.md).
72 70
 
73
-* For install instructions for Docker Toolbox, see [Docker Toolbox Overview](/toolbox/overview.md).
71
+- **Docker for Windows** - Install instructions are at [Getting Started with Docker for Windows](/docker-for-windows/index.md).
74 72
 
75
-* For a simple example of installing Docker on Ubuntu Linux so that you can work through this tutorial, see [Installing Docker on Ubuntu Linux (Example)](linux_install_help.md).
73
+- **Docker Toolbox** - Install instructions are at [Docker Toolbox Overview](/toolbox/overview.md).
76 74
 
77
-  For full install instructions for Docker on Linux, see [Install Docker Engine](/engine/installation/index.md) and select the flavor of Linux you want to use.
75
+- **Docker on Linux** - For a simple example of installing Docker on Ubuntu Linux so that you can work through this tutorial, see [Installing Docker on Ubuntu Linux (Example)](linux_install_help.md). Full install instructions for all flavors of Linux we support are at [Install Docker Engine](/engine/installation/index.md).
78 76
 
79 77
 ## Step 3: Verify your installation
80 78
 
81 79
 1. Open a command-line terminal, and run some Docker commands to verify that Docker is working as expected.
82 80
 
83
-  Some good commands to try are `docker version` to check that you have the latest release installed and `docker ps` to see if you have any running containers. (Probably not, since you just started.)
81
+    Some good commands to try are `docker version` to check that you have the latest release installed and `docker ps` to see if you have any running containers. (Probably not, since you just started.)
84 82
 
85 83
 2. Type the `docker run hello-world` command and press RETURN.
86 84
 
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_tag_push_pull"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 6
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_locate"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 3
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -10,7 +10,7 @@ description = "Getting started with Docker"
10 10
 keywords = ["beginner, getting started, Docker"]
11 11
 [menu.main]
12 12
 identifier = "getstart_understand"
13
-parent = "getstart_all"
13
+parent = "tutorial_getstart_menu"
14 14
 weight = 2
15 15
 +++
16 16
 <![end-metadata]-->
... ...
@@ -11,418 +11,46 @@ weight="-90"
11 11
 
12 12
 # Mac OS X
13 13
 
14
-You install Docker using Docker Toolbox. Docker Toolbox includes the following Docker tools:
14
+You have two options for installing Docker on Mac:
15 15
 
16
-* Docker Machine for running the `docker-machine` binary
17
-* Docker Engine for running the `docker` binary
18
-* Docker Compose for running the `docker-compose` binary
19
-* Kitematic, the Docker GUI
20
-* a shell preconfigured for a Docker command-line environment
21
-* Oracle VM VirtualBox
16
+- [Docker for Mac](#docker-for-mac)
17
+- [Docker Toolbox](#docker-toolbox)
22 18
 
23
-Because the Docker daemon uses Linux-specific kernel features, you can't run
24
-Docker natively in OS X. Instead, you must use `docker-machine` to create and
25
-attach to a virtual machine (VM). This machine is a Linux VM that hosts Docker
26
-for you on your Mac.
19
+## Docker for Mac
27 20
 
28
-**Requirements**
29
-
30
-Your Mac must be running OS X 10.8 "Mountain Lion" or newer to install the
31
-Docker Toolbox.
32
-
33
-### Learn the key concepts before installing
34
-
35
-In a Docker installation on Linux, your physical machine is both the localhost
36
-and the Docker host. In networking, localhost means your computer. The Docker
37
-host is the computer on which the containers run.
38
-
39
-On a typical Linux installation, the Docker client, the Docker daemon, and any
40
-containers run directly on your localhost. This means you can address ports on a
41
-Docker container using standard localhost addressing such as `localhost:8000` or
42
-`0.0.0.0:8376`.
43
-
44
-![Linux Architecture Diagram](images/linux_docker_host.svg)
45
-
46
-In an OS X installation, the `docker` daemon is running inside a Linux VM called
47
-`default`. The `default` is a lightweight Linux VM made specifically to run
48
-the Docker daemon on Mac OS X. The VM runs completely from RAM, is a small ~24MB
49
-download, and boots in approximately 5s.
50
-
51
-![OSX Architecture Diagram](images/mac_docker_host.svg)
52
-
53
-In OS X, the Docker host address is the address of the Linux VM. When you start
54
-the VM with `docker-machine` it is assigned an IP address. When you start a
55
-container, the ports on a container map to ports on the VM. To see this in
56
-practice, work through the exercises on this page.
57
-
58
-
59
-### Installation
60
-
61
-If you have VirtualBox running, you must shut it down before running the
62
-installer.
63
-
64
-1. Go to the [Docker Toolbox](https://www.docker.com/toolbox) page.
65
-
66
-2. Click the Download link.
67
-
68
-3. Install Docker Toolbox by double-clicking the package or by right-clicking
69
-and choosing "Open" from the pop-up menu.
70
-
71
-    The installer launches the "Install Docker Toolbox" dialog.
72
-
73
-    ![Install Docker Toolbox](images/mac-welcome-page.png)
74
-
75
-4. Press "Continue" to install the toolbox.
76
-
77
-    The installer presents you with options to customize the standard
78
-    installation.
79
-
80
-    ![Standard install](images/mac-page-two.png)
81
-
82
-    By default, the standard Docker Toolbox installation:
83
-
84
-    * installs binaries for the Docker tools in `/usr/local/bin`
85
-    * makes these binaries available to all users
86
-    * installs VirtualBox; or updates any existing installation
87
-
88
-    To change these defaults, press "Customize" or "Change
89
-    Install Location."
90
-
91
-5. Press "Install" to perform the standard installation.
92
-
93
-     The system prompts you for your password.
94
-
95
-     ![Password prompt](images/mac-password-prompt.png)
96
-
97
-6. Provide your password to continue with the installation.
98
-
99
-     When it completes, the installer provides you with some information you can
100
-     use to complete some common tasks.
101
-
102
-     ![All finished](images/mac-page-finished.png)
103
-
104
-7. Press "Close" to exit.
105
-
106
-## Running a Docker Container
107
-
108
-To run a Docker container, you:
109
-
110
-* Create a new (or start an existing) virtual machine
111
-* Switch your environment to your new VM
112
-* Use the `docker` client to create, load, and manage containers
113
-
114
-You can reuse this virtual machine as often as you like. Like any
115
-VirtualBox VM, it maintains its configuration between uses.
116
-
117
-There are two ways to use the installed tools, from the Docker Quickstart Terminal or
118
-[from your shell](#from-your-shell).
119
-
120
-### From the Docker Quickstart Terminal
121
-
122
-1. Open the "Applications" folder or the "Launchpad".
123
-
124
-2. Find the Docker Quickstart Terminal and double-click to launch it.
125
-
126
-    The application:
127
-
128
-    * Opens a terminal window
129
-    * Creates a `default` VM if it doesn't exists, and starts the VM after
130
-    * Points the terminal environment to this VM
131
-
132
-    Once the launch completes, the Docker Quickstart Terminal reports:
133
-
134
-     ![All finished](images/mac-success.png)
135
-
136
-    Now, you can run `docker` commands.
137
-
138
-3. Verify your setup succeeded by running the `hello-world` container.
139
-
140
-        $ docker run hello-world
141
-        Unable to find image 'hello-world:latest' locally
142
-        511136ea3c5a: Pull complete
143
-        31cbccb51277: Pull complete
144
-        e45a5af57b00: Pull complete
145
-        hello-world:latest: The image you are pulling has been verified.
146
-        Important: image verification is a tech preview feature and should not be
147
-        relied on to provide security.
148
-        Status: Downloaded newer image for hello-world:latest
149
-        Hello from Docker.
150
-        This message shows that your installation appears to be working correctly.
151
-
152
-        To generate this message, Docker took the following steps:
153
-        1. The Docker client contacted the Docker daemon.
154
-        2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
155
-           (Assuming it was not already locally available.)
156
-        3. The Docker daemon created a new container from that image which runs the
157
-           executable that produces the output you are currently reading.
158
-        4. The Docker daemon streamed that output to the Docker client, which sent it
159
-           to your terminal.
160
-
161
-        To try something more ambitious, you can run an Ubuntu container with:
162
-        $ docker run -it ubuntu bash
163
-
164
-        For more examples and ideas, visit:
165
-        http://docs.docker.com/userguide/
166
-
167
-
168
-A more typical way to interact with the Docker tools is from your regular shell command line.
169
-
170
-### From your shell
171
-
172
-This section assumes you are running a Bash shell. You may be running a
173
-different shell such as C Shell but the commands are the same.
174
-
175
-1. Create a new Docker VM.
176
-
177
-        $ docker-machine create --driver virtualbox default
178
-        Creating VirtualBox VM...
179
-        Creating SSH key...
180
-        Starting VirtualBox VM...
181
-        Starting VM...
182
-        To see how to connect Docker to this machine, run: docker-machine env default
183
-
184
-    This creates a new `default` VM in VirtualBox.
185
-
186
-    The command also creates a machine configuration in the
187
-    `~/.docker/machine/machines/default` directory. You only need to run the
188
-    `create` command once. Then, you can use `docker-machine` to start, stop,
189
-    query, and otherwise manage the VM from the command line.
190
-
191
-2. List your available machines.
192
-
193
-        $ docker-machine ls
194
-        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
195
-        default             *        virtualbox   Running   tcp://192.168.99.101:2376
196
-
197
-    If you have previously installed the deprecated Boot2Docker application or
198
-    run the Docker Quickstart Terminal, you may have a `dev` VM as well.  When you
199
-    created `default` VM, the `docker-machine` command provided instructions
200
-    for learning how to connect the VM.
201
-
202
-3. Get the environment commands for your new VM.
203
-
204
-        $ docker-machine env default
205
-        export DOCKER_TLS_VERIFY="1"
206
-        export DOCKER_HOST="tcp://192.168.99.101:2376"
207
-        export DOCKER_CERT_PATH="/Users/mary/.docker/machine/machines/default"
208
-        export DOCKER_MACHINE_NAME="default"
209
-        # Run this command to configure your shell:
210
-        # eval "$(docker-machine env default)"
211
-
212
-4. Connect your shell to the `default` machine.
213
-
214
-        $ eval "$(docker-machine env default)"
215
-
216
-5. Run the `hello-world` container to verify your setup.
21
+Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses <a href="https://github.com/mist64/xhyve/" target="_blank">xhyve</a> to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon.
217 22
 
218
-        $ docker run hello-world
23
+Go to [Getting Started with Docker for Mac](/docker-for-mac/index.md) for download and install instructions, and to learn all about Docker for Mac.
219 24
 
220
-## Learn about your Toolbox installation
221
-
222
-Toolbox installs the Docker Engine binary, the Docker binary on your system. When you
223
-use the Docker Quickstart Terminal or create a `default` VM manually, Docker
224
-Machine updates the `~/.docker/machine/machines/default` folder to your
225
-system. This folder contains the configuration for the VM.
226
-
227
-You can create multiple VMs on your system with Docker Machine. Therefore, you
228
-may end up with multiple VM folders if you have more than one VM. To remove a
229
-VM, use the `docker-machine rm <machine-name>` command.
230
-
231
-## Migrate from Boot2Docker
232
-
233
-If you were using Boot2Docker previously, you have a pre-existing Docker
234
-`boot2docker-vm` VM on your local system.  To allow Docker Machine to manage
235
-this older VM, you can migrate it.
236
-
237
-1. Open a terminal or the Docker CLI on your system.
238
-
239
-2. Type the following command.
240
-
241
-        $ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
242
-
243
-3. Use the `docker-machine` command to interact with the migrated VM.
244
-
245
-The `docker-machine` subcommands are slightly different than the `boot2docker`
246
-subcommands. The table below lists the equivalent `docker-machine` subcommand
247
-and what it does:
248
-
249
-|  `boot2docker` | `docker-machine` | `docker-machine` description                             |
250
-|----------------|------------------|----------------------------------------------------------|
251
-| init           | create           | Creates a new docker host.                               |
252
-| up             | start            | Starts a stopped machine.                                |
253
-| ssh            | ssh              | Runs a command or interactive ssh session on the machine.|
254
-| save           | -                | Not applicable.                                          |
255
-| down           | stop             | Stops a running machine.                                 |
256
-| poweroff       | stop             | Stops a running machine.                                 |
257
-| reset          | restart          | Restarts a running machine.                              |
258
-| config         | inspect          | Prints machine configuration details.                    |
259
-| status         | ls               | Lists all machines and their status.                     |
260
-| info           | inspect          | Displays a machine's details.                            |
261
-| ip             | ip               | Displays the machine's ip address.                       |
262
-| shellinit      | env              | Displays shell commands needed to configure your shell to interact with a machine |
263
-| delete         | rm               | Removes a machine.                                       |
264
-| download       | -                | Not applicable.                                          |
265
-| upgrade        | upgrade          | Upgrades a machine's Docker client to the latest stable release. |
266
-
267
-
268
-## Examples on Mac OS X
269
-
270
-Work through this section to try some practical container tasks on a VM. At this
271
-point, you should have a VM running and be connected to it through your shell.
272
-To verify this, run the following commands:
273
-
274
-    $ docker-machine ls
275
-    NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
276
-    default             *        virtualbox   Running   tcp://192.168.99.100:2376
277
-
278
-The `ACTIVE` machine, in this case `default`, is the one your environment is pointing to.
279
-
280
-### Access container ports
281
-
282
-1. Start an NGINX container on the DOCKER_HOST.
283
-
284
-        $ docker run -d -P --name web nginx
285
-
286
-    Normally, the `docker run` commands starts a container, runs it, and then
287
-    exits. The `-d` flag keeps the container running in the background
288
-    after the `docker run` command completes. The `-P` flag publishes exposed ports from the
289
-    container to your local host; this lets you access them from your Mac.
290
-
291
-2. Display your running container with `docker ps` command
292
-
293
-        CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS              PORTS                                           NAMES
294
-        5fb65ff765e9        nginx:latest        "nginx -g 'daemon of   3 minutes ago       Up 3 minutes        0.0.0.0:49156->443/tcp, 0.0.0.0:49157->80/tcp   web
295
-
296
-    At this point, you can see `nginx` is running as a daemon.
297
-
298
-3. View just the container's ports.
299
-
300
-        $ docker port web
301
-        443/tcp -> 0.0.0.0:49156
302
-        80/tcp -> 0.0.0.0:49157
303
-
304
-    This tells you that the `web` container's port `80` is mapped to port
305
-    `49157` on your Docker host.
306
-
307
-4. Enter the `http://localhost:49157` address (`localhost` is `0.0.0.0`) in your browser:
308
-
309
-    ![Bad Address](images/bad_host.png)
310
-
311
-    This didn't work. The reason it doesn't work is your `DOCKER_HOST` address is
312
-    not the localhost address (0.0.0.0) but is instead the address of your Docker VM.
313
-
314
-5. Get the address of the `default` VM.
315
-
316
-        $ docker-machine ip default
317
-        192.168.59.103
318
-
319
-6. Enter the `http://192.168.59.103:49157` address in your browser:
320
-
321
-    ![Correct Addressing](images/good_host.png)
322
-
323
-    Success!
324
-
325
-7. To stop and then remove your running `nginx` container, do the following:
326
-
327
-        $ docker stop web
328
-        $ docker rm web
329
-
330
-### Mount a volume on the container
331
-
332
-When you start a container it automatically shares your `/Users/username` directory
333
-with the VM. You can use this share point to mount directories onto your container.
334
-The next exercise demonstrates how to do this.
335
-
336
-1. Change to your user `$HOME` directory.
337
-
338
-        $ cd $HOME
339
-
340
-2. Make a new `site` directory.
341
-
342
-        $ mkdir site
343
-
344
-3. Change into the `site` directory.
345
-
346
-        $ cd site
347
-
348
-4. Create a new `index.html` file.
349
-
350
-        $ echo "my new site" > index.html
351
-
352
-5. Start a new `nginx` container and replace the `html` folder with your `site` directory.
353
-
354
-        $ docker run -d -P -v $HOME/site:/usr/share/nginx/html \
355
-          --name mysite nginx
356
-
357
-6. View the `mysite` container's port.
358
-
359
-        $ docker port mysite
360
-        80/tcp -> 0.0.0.0:49166
361
-        443/tcp -> 0.0.0.0:49165
362
-
363
-7. Open the site in a browser:
364
-
365
-    ![My site page](images/newsite_view.png)
366
-
367
-8. Add a page to your `$HOME/site` in real time.
368
-
369
-        $ echo "This is cool" > cool.html
370
-
371
-9. Open the new page in the browser.
372
-
373
-    ![Cool page](images/cool_view.png)
374
-
375
-10. Stop and then remove your running `mysite` container.
376
-
377
-        $ docker stop mysite
378
-        $ docker rm mysite
379
-
380
-> **Note**: There is a [known
381
-> issue](https://docs.docker.com/machine/drivers/virtualbox/#known-issues) that
382
-> may cause files shared with your nginx container to not update correctly as you
383
-> modify them on your host.
384
-
385
-## Upgrade Docker Toolbox
386
-
387
-To upgrade Docker Toolbox, download and re-run the [Docker Toolbox
388
-installer](https://docker.com/toolbox/).
25
+**Requirements**
389 26
 
27
+- Mac must be a 2010 or newer model, with Intel's hardware support for memory management unit (MMU) virtualization; i.e., Extended Page Tables (EPT)
390 28
 
391
-## Uninstall Docker Toolbox
29
+- OS X 10.10.3 Yosemite or newer
392 30
 
393
-To uninstall, do the following:
31
+- At least 4GB of RAM
394 32
 
395
-1. List your machines.
33
+- VirtualBox prior to version 4.3.30 must NOT be installed (it is incompatible with Docker for Mac). Docker for Mac will error out on install in this case. Uninstall the older version of VirtualBox and re-try the install.
396 34
 
397
-        $ docker-machine ls
398
-        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
399
-        dev                 *        virtualbox   Running   tcp://192.168.99.100:2376
400
-        my-docker-machine            virtualbox   Stopped
401
-        default                      virtualbox   Stopped
35
+## Docker Toolbox
402 36
 
403
-2. Remove each machine.
37
+If you have an earlier Mac that doesn't meet the Docker for Mac requirements, <a href="https://www.docker.com/products/docker-toolbox" target="_blank">get Docker Toolbox</a> for the Mac.
404 38
 
405
-        $ docker-machine rm dev
406
-        Successfully removed dev
39
+See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docker with Toolbox.
407 40
 
408
-     Removing a machine deletes its VM from VirtualBox and from the
409
-     `~/.docker/machine/machines` directory.
41
+The Docker Toolbox setup does not run Docker natively in OS X. Instead, it uses `docker-machine` to create and attach to a virtual machine (VM). This machine is a Linux VM that hosts Docker for you on your Mac.
410 42
 
411
-3. Remove the Docker Quickstart Terminal and Kitematic from your "Applications" folder.
43
+**Requirements**
412 44
 
413
-4. Remove the `docker`, `docker-compose`, and `docker-machine` commands from the `/usr/local/bin` folder.
45
+Your Mac must be running OS X 10.8 "Mountain Lion" or newer to install the Docker Toolbox. Full install instructions are at [Toolbox install instructions for Mac](/toolbox/toolbox_install_mac.md).
414 46
 
415
-        $ rm /usr/local/bin/docker
416 47
 
417
-5. Delete the `~/.docker` folder from your system.
48
+## Learning more
418 49
 
50
+* If you are new to Docker, try out the [Getting Started](../getstarted/index.md) tutorial for a hands-on tour, including using Docker commands, running containers, building images, and working with Docker Hub.
419 51
 
420
-## Learning more
52
+* You can find more extensive examples in [Learn by example](../tutorials/index.md) and in the [Docker Engine User Guide](../userguide/index.md).
421 53
 
422
-Use `docker-machine help` to list the full command line reference for Docker Machine. For more
423
-information about using SSH or SCP to access a VM, see the [Docker Machine
424
-documentation](https://docs.docker.com/machine/).
54
+* If you are interested in using the Kitematic GUI, see the [Kitematic user guide](https:docs.docker.com/kitematic/userguide/).
425 55
 
426
-You can continue with the [Docker Engine User Guide](../userguide/index.md). If you are
427
-interested in using the Kitematic GUI, see the [Kitematic user
428
-guide](https://docs.docker.com/kitematic/userguide/).
56
+> **Note**: The Boot2Docker command line was deprecated several releases > back in favor of Docker Machine, and now Docker for Windows.
... ...
@@ -11,369 +11,41 @@ weight="-80"
11 11
 
12 12
 # Windows
13 13
 
14
-> **Note**: This release of Docker deprecates the Boot2Docker command line in
15
-> favor of Docker Machine.  Use the Docker Toolbox to install Docker Machine as
16
-> well as the other Docker tools.
14
+You have two options for installing Docker on Windows:
17 15
 
18
-You install Docker using Docker Toolbox. Docker Toolbox includes the following Docker tools:
16
+- [Docker for Windows](#docker-for-windows)
17
+- [Docker Toolbox](#docker-toolbox)
19 18
 
20
-* Docker Machine for running the `docker-machine` binary
21
-* Docker Engine for running the `docker` binary
22
-* Kitematic, the Docker GUI
23
-* a shell preconfigured for a Docker command-line environment
24
-* Oracle VM VirtualBox
19
+## Docker for Windows
25 20
 
26
-Because the Docker daemon uses Linux-specific kernel features, you can't run
27
-Docker natively in Windows. Instead, you must use `docker-machine` to create and attach to a Docker VM on your machine. This VM hosts Docker for you on your Windows system.
21
+Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon.
28 22
 
29
-The virtual machine runs a lightweight Linux distribution made specifically to
30
-run the Docker daemon. The VirtualBox VM runs completely from RAM, is a small
31
-~24MB download, and boots in approximately 5s.
23
+Go to [Getting Started with Docker for Windows](/docker-for-windows/index.md) for download and install instructions, and to learn all about Docker for Windows.
32 24
 
33
-## Requirements
25
+**Requirements**
34 26
 
35
-To run Docker, your machine must have a 64-bit operating system running Windows 7 or higher. Additionally, you must make sure that virtualization is enabled on your machine.
36
-To verify your machine meets these requirements, do the following:
27
+* 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later). In the future we will support more versions of Windows 10.
37 28
 
38
-1. Right click the Windows Start Menu and choose **System**.
29
+* The Hyper-V package must be enabled. The Docker for Windows installer will enable it for you, if needed. (This requires a reboot).
39 30
 
40
-    ![Which version](images/win_ver.png)
31
+## Docker Toolbox
41 32
 
42
-    If you are using an unsupported version of Windows, you should consider
43
-    upgrading your operating system in order to try out Docker.
33
+If you have an earlier Windows system that doesn't meet the Docker for Windows requirements, <a href="https://www.docker.com/products/docker-toolbox" target="_blank">get Docker Toolbox</a>.
44 34
 
45
-2. Make sure your CPU supports [virtualization technology](https://en.wikipedia.org/wiki/X86_virtualization)
46
-and virtualization support is enabled in BIOS and recognized by Windows.
35
+See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docker with Toolbox.
47 36
 
48
-    #### For Windows 8, 8.1 or 10
37
+The Docker Toolbox setup does not run Docker natively in OS X. Instead, it uses `docker-machine` to create and attach to a virtual machine (VM). This machine is a Linux VM that hosts Docker for you on your Mac.
49 38
 
50
-	  Choose **Start > Task Manager**. On Windows 10, click more details. Navigate to the **Performance** tab.
51
-	  Under **CPU** you should see the following:
39
+**Requirements**
52 40
 
53
-      ![Release page](images/virtualization.png)
41
+To run Docker, your machine must have a 64-bit operating system running Windows 7 or higher. Additionally, you must make sure that virtualization is enabled on your machine. For details, see the [Toolbox install instructions for Windows](/toolbox/toolbox_install_windows.md).
54 42
 
55
-    If virtualization is not enabled on your system, follow the manufacturer's instructions for enabling it.
43
+## Learning more
56 44
 
57
-    #### For Windows 7
45
+* If you are new to Docker, try out the [Getting Started](../getstarted/index.md) tutorial for a hands-on tour, including using Docker commands, running containers, building images, and working with Docker Hub.
58 46
 
59
-	  Run the <a
60
-	  href="http://www.microsoft.com/en-us/download/details.aspx?id=592"
61
-	  target="_blank"> Microsoft® Hardware-Assisted Virtualization Detection
62
-	  Tool</a> and follow the on-screen instructions.
47
+* You can find more extensive examples in [Learn by example](../tutorials/index.md) and in the [Docker Engine User Guide](../userguide/index.md).
63 48
 
64
-3. Verify your Windows OS is 64-bit (x64)
49
+* If you are interested in using the Kitematic GUI, see the [Kitematic user guide](https://docs.docker.com/kitematic/userguide/).
65 50
 
66
-   How you do this verification depends on your Windows version.  For details, see the Windows
67
-    article [How to determine whether a computer is running a 32-bit version or 64-bit version
68
-    of the Windows operating system](https://support.microsoft.com/en-us/kb/827218).
69
-
70
-> **Note**: If you have Docker hosts running and you don't wish to do a Docker Toolbox
71
-installation, you can install the `docker.exe` using the *unofficial* Windows package
72
-manager Chocolatey. For information on how to do this, see [Docker package on
73
-Chocolatey](http://chocolatey.org/packages/docker).
74
-
75
-### Learn the key concepts before installing
76
-
77
-In a Docker installation on Linux, your machine is both the localhost and the
78
-Docker host. In networking, localhost means your computer. The Docker host is
79
-the machine on which the containers run.
80
-
81
-On a typical Linux installation, the Docker client, the Docker daemon, and any
82
-containers run directly on your localhost. This means you can address ports on a
83
-Docker container using standard localhost addressing such as `localhost:8000` or
84
-`0.0.0.0:8376`.
85
-
86
-![Linux Architecture Diagram](images/linux_docker_host.svg)
87
-
88
-In a Windows installation, the `docker` daemon is running inside a Linux virtual
89
-machine. You use the Windows Docker client to talk to the Docker host VM. Your
90
-Docker containers run inside this host.
91
-
92
-![Windows Architecture Diagram](images/win_docker_host.svg)
93
-
94
-In Windows, the Docker host address is the address of the Linux VM. When you
95
-start the VM with `docker-machine` it is assigned an IP address. When you start
96
-a container, the ports on a container map to ports on the VM. To see this in
97
-practice, work through the exercises on this page.
98
-
99
-
100
-### Installation
101
-
102
-If you have VirtualBox running, you must shut it down before running the
103
-installer.
104
-
105
-1. Go to the [Docker Toolbox](https://www.docker.com/toolbox) page.
106
-
107
-2. Click the installer link to download.
108
-
109
-3. Install Docker Toolbox by double-clicking the installer.
110
-
111
-    The installer launches the "Setup - Docker Toolbox" dialog.
112
-
113
-    ![Install Docker Toolbox](images/win-welcome.png)
114
-
115
-4. Press "Next" to install the toolbox.
116
-
117
-    The installer presents you with options to customize the standard
118
-    installation. By default, the standard Docker Toolbox installation:
119
-
120
-    * installs executables for the Docker tools in `C:\Program Files\Docker Toolbox`
121
-    * install VirtualBox; or updates any existing installation
122
-    * adds a Docker Inc. folder to your program shortcuts
123
-    * updates your `PATH` environment variable
124
-    * adds desktop icons for the Docker Quickstart Terminal and Kitematic
125
-
126
-    This installation assumes the defaults are acceptable.
127
-
128
-5. Press "Next" until you reach the "Ready to Install" page.
129
-
130
-     The system prompts you for your password.
131
-
132
-     ![Install](images/win-page-6.png)
133
-
134
-6. Press "Install"  to continue with the installation.
135
-
136
-     When it completes, the installer provides you with some information you can
137
-     use to complete some common tasks.
138
-
139
-     ![All finished](images/windows-finish.png)
140
-
141
-7. Press "Finish" to exit.
142
-
143
-## Running a Docker Container
144
-
145
-To run a Docker container, you:
146
-
147
-* Create a new (or start an existing) Docker virtual machine
148
-* Switch your environment to your new VM
149
-* Use the `docker` client to create, load, and manage containers
150
-
151
-Once you create a machine, you can reuse it as often as you like. Like any
152
-VirtualBox VM, it maintains its configuration between uses.
153
-
154
-There are several ways to use the installed tools, from the Docker Quickstart Terminal or
155
-[from your shell](#from-your-shell).
156
-
157
-### Using the Docker Quickstart Terminal
158
-
159
-1. Find the Docker Quickstart Terminal icon on your Desktop and double-click to launch it.
160
-
161
-    The application:
162
-
163
-    * Opens a terminal window
164
-    * Creates a `default` VM if it doesn't exist, and starts the VM after
165
-    * Points the terminal environment to this VM
166
-
167
-    Once the launch completes, you can run `docker` commands.
168
-
169
-3. Verify your setup succeeded by running the `hello-world` container.
170
-
171
-        $ docker run hello-world
172
-        Unable to find image 'hello-world:latest' locally
173
-        511136ea3c5a: Pull complete
174
-        31cbccb51277: Pull complete
175
-        e45a5af57b00: Pull complete
176
-        hello-world:latest: The image you are pulling has been verified.
177
-        Important: image verification is a tech preview feature and should not be
178
-        relied on to provide security.
179
-        Status: Downloaded newer image for hello-world:latest
180
-        Hello from Docker.
181
-        This message shows that your installation appears to be working correctly.
182
-
183
-        To generate this message, Docker took the following steps:
184
-        1. The Docker client contacted the Docker daemon.
185
-        2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
186
-           (Assuming it was not already locally available.)
187
-        3. The Docker daemon created a new container from that image which runs the
188
-           executable that produces the output you are currently reading.
189
-        4. The Docker daemon streamed that output to the Docker client, which sent it
190
-           to your terminal.
191
-
192
-        To try something more ambitious, you can run an Ubuntu container with:
193
-        $ docker run -it ubuntu bash
194
-
195
-        For more examples and ideas, visit:
196
-        http://docs.docker.com/userguide/
197
-
198
-
199
-### Using Docker from Windows Command Prompt (cmd.exe)
200
-
201
-1. Launch a Windows Command Prompt (cmd.exe).
202
-
203
-    The `docker-machine` command requires `ssh.exe` in your `PATH` environment
204
-    variable. This `.exe` is in the MsysGit `bin` folder.
205
-
206
-2. Add this to the `%PATH%` environment variable by running:
207
-
208
-        set PATH=%PATH%;"c:\Program Files (x86)\Git\bin"
209
-
210
-3. Create a new Docker VM.
211
-
212
-        docker-machine create --driver virtualbox my-default
213
-        Creating VirtualBox VM...
214
-        Creating SSH key...
215
-        Starting VirtualBox VM...
216
-        Starting VM...
217
-        To see how to connect Docker to this machine, run: docker-machine env my-default
218
-
219
-    The command also creates a machine configuration in the
220
-    `C:\USERS\USERNAME\.docker\machine\machines` directory. You only need to run the `create`
221
-    command once. Then, you can use `docker-machine` to start, stop, query, and
222
-    otherwise manage the VM from the command line.
223
-
224
-4. List your available machines.
225
-
226
-        C:\Users\mary> docker-machine ls
227
-        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
228
-        my-default        *        virtualbox   Running   tcp://192.168.99.101:2376
229
-
230
-    If you have previously installed the deprecated Boot2Docker application or
231
-    run the Docker Quickstart Terminal, you may have a `dev` VM as well.
232
-
233
-5. Get the environment commands for your new VM.
234
-
235
-        C:\Users\mary> docker-machine env --shell cmd my-default
236
-
237
-6. Connect your shell to the `my-default` machine.
238
-
239
-        C:\Users\mary> eval "$(docker-machine env my-default)"
240
-
241
-7. Run the `hello-world` container to verify your setup.
242
-
243
-        C:\Users\mary> docker run hello-world
244
-
245
-### Using Docker from PowerShell
246
-
247
-1. Launch a Windows PowerShell window.
248
-
249
-2. Add `ssh.exe` to your PATH:
250
-
251
-        PS C:\Users\mary> $Env:Path = "${Env:Path};c:\Program Files (x86)\Git\bin"
252
-
253
-3. Create a new Docker VM.
254
-
255
-        PS C:\Users\mary> docker-machine create --driver virtualbox my-default
256
-
257
-4. List your available machines.
258
-
259
-        C:\Users\mary> docker-machine ls
260
-        NAME                ACTIVE   DRIVER       STATE     URL                         SWARM
261
-        my-default        *        virtualbox   Running   tcp://192.168.99.101:2376
262
-
263
-5. Get the environment commands for your new VM.
264
-
265
-        C:\Users\mary> docker-machine env --shell powershell my-default
266
-
267
-6. Connect your shell to the `my-default` machine.
268
-
269
-        C:\Users\mary> eval "$(docker-machine env my-default)"
270
-
271
-7. Run the `hello-world` container to verify your setup.
272
-
273
-        C:\Users\mary> docker run hello-world
274
-
275
-
276
-## Learn about your Toolbox installation
277
-
278
-Toolbox installs the Docker Engine binary in the `C:\Program Files\Docker
279
-Toolbox` directory. When you use the Docker Quickstart Terminal or create a
280
-`default` VM manually, Docker Machine updates the
281
-`C:\USERS\USERNAME\.docker\machine\machines\default` folder to your
282
-system. This folder contains the configuration for the VM.
283
-
284
-You can create multiple VMs on your system with Docker Machine. Therefore, you
285
-may end up with multiple VM folders if you have created more than one VM. To
286
-remove a VM, use the `docker-machine rm <machine-name>` command.
287
-
288
-## Migrate from Boot2Docker
289
-
290
-If you were using Boot2Docker previously, you have a pre-existing Docker
291
-`boot2docker-vm` VM on your local system.  To allow Docker Machine to manage
292
-this older VM, you can migrate it.
293
-
294
-1. Open a terminal or the Docker CLI on your system.
295
-
296
-2. Type the following command.
297
-
298
-        $ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
299
-
300
-3. Use the `docker-machine` command to interact with the migrated VM.
301
-
302
-The `docker-machine` subcommands are slightly different than the `boot2docker`
303
-subcommands. The table below lists the equivalent `docker-machine` subcommand
304
-and what it does:
305
-
306
-|  `boot2docker` | `docker-machine` | `docker-machine` description                             |
307
-|----------------|------------------|----------------------------------------------------------|
308
-| init           | create           | Creates a new docker host.                               |
309
-| up             | start            | Starts a stopped machine.                                |
310
-| ssh            | ssh              | Runs a command or interactive ssh session on the machine.|
311
-| save           | -                | Not applicable.                                          |
312
-| down           | stop             | Stops a running machine.                                 |
313
-| poweroff       | stop             | Stops a running machine.                                 |
314
-| reset          | restart          | Restarts a running machine.                              |
315
-| config         | inspect          | Prints machine configuration details.                    |
316
-| status         | ls               | Lists all machines and their status.                     |
317
-| info           | inspect          | Displays a machine's details.                            |
318
-| ip             | ip               | Displays the machine's ip address.                       |
319
-| shellinit      | env              | Displays shell commands needed to configure your shell to interact with a machine |
320
-| delete         | rm               | Removes a machine.                                       |
321
-| download       | -                | Not applicable.                                          |
322
-| upgrade        | upgrade          | Upgrades a machine's Docker client to the latest stable release. |
323
-
324
-
325
-## Upgrade Docker Toolbox
326
-
327
-To upgrade Docker Toolbox, download and re-run [the Docker Toolbox
328
-installer](https://www.docker.com/toolbox).
329
-
330
-## Container port redirection
331
-
332
-If you are curious, the username for the Docker default VM is `docker` and the
333
-password is `tcuser`. The latest version of `docker-machine` sets up a host only
334
-network adaptor which provides access to the container's ports.
335
-
336
-If you run a container with a published port:
337
-
338
-    $ docker run --rm -i -t -p 80:80 nginx
339
-
340
-Then you should be able to access that nginx server using the IP address
341
-reported to you using:
342
-
343
-    $ docker-machine ip
344
-
345
-Typically, the IP is 192.168.59.103, but it could get changed by VirtualBox's
346
-DHCP implementation.
347
-
348
-> **Note**: There is a [known
349
-> issue](https://docs.docker.com/machine/drivers/virtualbox/#known-issues) that
350
-> may cause files shared with your nginx container to not update correctly as you
351
-> modify them on your host.
352
-
353
-## Login with PUTTY instead of using the CMD
354
-
355
-Docker Machine generates and uses the public/private key pair in your
356
-`%USERPROFILE%\.docker\machine\machines\<name_of_your_machine>` directory. To
357
-log in you need to use the private key from this same directory. The private key
358
-needs to be converted into the format PuTTY uses. You can do this with
359
-[puttygen](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html):
360
-
361
-1. Open `puttygen.exe` and load ("File"->"Load" menu) the private key from (you may need to change to the `All Files (*.*)` filter)
362
-
363
-        %USERPROFILE%\.docker\machine\machines\<name_of_your_machine>\id_rsa
364
-
365
-2. Click "Save Private Key".
366
-
367
-3.  Use the saved file to login with PuTTY using `docker@127.0.0.1:2022`.
368
-
369
-## Uninstallation
370
-
371
-You can uninstall Docker Toolbox using Window's standard process for removing
372
-programs. This process does not remove the `docker-install.exe` file. You must
373
-delete that file yourself.
374
-
375
-## Learn more
376
-
377
-You can continue with the [Docker Engine User Guide](../userguide/index.md). If you are
378
-interested in using the Kitematic GUI, see the [Kitematic user
379
-guide](https://docs.docker.com/kitematic/userguide/).
51
+> **Note**: The Boot2Docker command line was deprecated several releases > back in favor of Docker Machine, and now Docker for Windows.
... ...
@@ -8,7 +8,7 @@ title = "Build your own images"
8 8
 description = "How to work with Docker images."
9 9
 keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub,  collaboration"]
10 10
 [menu.main]
11
-parent = "engine_learn"
11
+parent = "engine_learn_menu"
12 12
 weight = -4
13 13
 +++
14 14
 <![end-metadata]-->
... ...
@@ -8,7 +8,7 @@ title = "Hello world in a container"
8 8
 description = "A simple 'Hello world' exercise that introduced you to Docker."
9 9
 keywords = ["docker guide, docker, docker platform, how to, dockerize, dockerizing apps, dockerizing applications, container,  containers"]
10 10
 [menu.main]
11
-parent = "engine_learn"
11
+parent = "engine_learn_menu"
12 12
 weight=-6
13 13
 +++
14 14
 <![end-metadata]-->
... ...
@@ -8,7 +8,7 @@ title = "Store images on Docker Hub"
8 8
 description = "Learn how to use the Docker Hub to manage Docker images and work flow"
9 9
 keywords = ["repo, Docker Hub, Docker Hub, registry, index, repositories, usage, pull image, push image, image,  documentation"]
10 10
 [menu.main]
11
-parent = "engine_learn"
11
+parent = "engine_learn_menu"
12 12
 +++
13 13
 <![end-metadata]-->
14 14
 
... ...
@@ -8,7 +8,7 @@ title = "Manage data in containers"
8 8
 description = "How to manage data inside your Docker containers."
9 9
 keywords = ["Examples, Usage, volume, docker, documentation, user guide, data,  volumes"]
10 10
 [menu.main]
11
-parent = "engine_learn"
11
+parent = "engine_learn_menu"
12 12
 +++
13 13
 <![end-metadata]-->
14 14
 
... ...
@@ -6,9 +6,8 @@ aliases = [
6 6
 title = "Learn by example"
7 7
 description = "Explains how to work with containers"
8 8
 keywords = ["docker, introduction, documentation, about, technology, docker.io, user, guide, user's, manual, platform, framework, home,  intro"]
9
-[menu.main]
10 9
 identifier="engine_learn"
11
-parent = "engine_use"
10
+parent = "engine_learn_menu"
12 11
 weight="-80"
13 12
 +++
14 13
 <![end-metadata]-->
15 14
new file mode 100644
... ...
@@ -0,0 +1,16 @@
0
+<!--[metadata]>
1
+aliases = [
2
+]
3
+title = "Learn by example"
4
+description = "Explains how to work with containers"
5
+keywords = ["docker, introduction, documentation, about, technology, docker.io, user, guide, user's, manual, platform, framework, home,  intro"]
6
+type = "menu"
7
+[menu.main]
8
+identifier = "engine_learn_menu"
9
+parent = "engine_use"
10
+weight = -79
11
+<![end-metadata]-->
12
+
13
+# Learn by example
... ...
@@ -8,7 +8,7 @@ title = "Network containers"
8 8
 description = "How to network Docker containers."
9 9
 keywords = ["Examples, Usage, volume, docker, documentation, user guide, data,  volumes"]
10 10
 [menu.main]
11
-parent = "engine_learn"
11
+parent = "engine_learn_menu"
12 12
 weight = -3
13 13
 +++
14 14
 <![end-metadata]-->
... ...
@@ -7,7 +7,7 @@ title = "Run a simple application"
7 7
 description = "Learn how to manage and operate Docker containers."
8 8
 keywords = ["docker, the docker guide, documentation, docker.io, monitoring containers, docker top, docker inspect, docker port, ports, docker logs, log,  Logs"]
9 9
 [menu.main]
10
-parent = "engine_learn"
10
+parent = "engine_learn_menu"
11 11
 weight=-5
12 12
 +++
13 13
 <![end-metadata]-->
... ...
@@ -1,12 +1,12 @@
1 1
 <!--[metadata]>
2 2
 +++
3
-title = "User guide"
3
+title = "User Guide"
4 4
 description = "How to use the Docker Engine user guide"
5 5
 keywords = ["engine, introduction, documentation, about, technology, docker, user, guide, framework, home,  intro"]
6 6
 [menu.main]
7 7
 parent="engine_use"
8 8
 identifier = "engine_guide"
9
-weight="-79"
9
+weight="-78"
10 10
 +++
11 11
 <![end-metadata]-->
12 12