fixing links and merge conflicts
updated link to faqs/troubleshoot to point to new location /toolbox fixed docker-for-mac link error Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
parent
0c78a7dd64
commit
1d80f8ca19
|
@ -30,27 +30,27 @@ Depending on your interest, the Docker documentation contains a wealth of inform
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">More about Docker for Mac, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
|
<td class="tg-031e">More about Docker for Mac, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
|
||||||
<td class="tg-031e"><a href="https://docs.docker.com/docker-for-mac/">Getting Started with Docker for Mac</a></td>
|
<td class="tg-031e">[Getting Started with Docker for Mac](/docker-for-mac/index.md)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">More about Docker for Windows, More about Docker for Mac, features, examples, FAQs, relationship to Docker Machine and Docker Toolbox, and how this fits in the Docker ecosystem</td>
|
<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>
|
||||||
<td class="tg-031e"><a href="https://docs.docker.com/docker-for-windows/">Getting Started with Docker for Windows</a></td>
|
<td class="tg-031e">[Getting Started with Docker for Windows](/docker-for-mac/index.md)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">More about Docker Toolbox</td>
|
<td class="tg-031e">More about Docker Toolbox</td>
|
||||||
<td class="tg-031e"><a href="https://docs.docker.com/toolbox/overview/">Docker Toolbox Overview</a></td>
|
<td class="tg-031e">[Docker Toolbox Overview](/toolbox/overview.md)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">More about Docker for Linux distributions</td>
|
<td class="tg-031e">More about Docker for Linux distributions</td>
|
||||||
<td class="tg-031e"><a href="https://docs.docker.com//engine/installation/linux/">Install Docker Engine on Linux</a></td>
|
<td class="tg-031e">[Install Docker Engine on Linux](/engine/installation/linux/index.md)</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">More advanced tutorials on running containers, building your own images, networking containers, managing data for containers, and storing images on Docker Hub</td>
|
<td class="tg-031e">More advanced tutorials on running containers, building your own images, networking containers, managing data for containers, and storing images on Docker Hub</td>
|
||||||
<td class="tg-031e"> <a href="http://www.docker.com//engine/tutorials/">Learn by example</a></td>
|
<td class="tg-031e"> [Learn by example](/engine/tutorials/index.md)</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">Information about the Docker product line</td>
|
<td class="tg-031e">Information about the Docker product line</td>
|
||||||
<td class="tg-031e"><a href="http://www.docker.com/products">The product explainer is a good place to start.</a></td>
|
<td class="tg-031e"><a href="http://www.docker.com/products/">The product explainer is a good place to start.</a></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -59,7 +59,8 @@ Depending on your interest, the Docker documentation contains a wealth of inform
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="tg-031e">How to run a multi-container application with Compose</td>
|
<td class="tg-031e">How to run a multi-container application with Compose</td>
|
||||||
<td class="tg-031e"><a href="https://docs.docker.com/compose/gettingstarted/">Docker Compose documentation</a></td>
|
<td class="tg-031e"> [Docker Compose documentation](/compose/overview.md)
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
|
@ -60,15 +60,13 @@ commands to run. Your recipe is going to be very short.
|
||||||
|
|
||||||
FROM docker/whalesay:latest
|
FROM docker/whalesay:latest
|
||||||
|
|
||||||
The `FROM` keyword tells Docker which image your image is based on. Whalesay is cute and has the `cowsay` program already, so we'll start there.
|
The `FROM` keyword tells Docker which image your image is based on. Whalesay is cute and has the `cowsay` program already, so we'll start there.
|
||||||
|
|
||||||
7. Now, add the `fortunes` program to the image.
|
7. Now, add the `fortunes` program to the image.
|
||||||
|
|
||||||
RUN apt-get -y update && apt-get install -y fortunes
|
RUN apt-get -y update && apt-get install -y fortunes
|
||||||
|
|
||||||
The `fortunes` program has a command that prints out wise sayings for our
|
The `fortunes` program has a command that prints out wise sayings for our whale to say. So, the first step is to install it. This line installs the software into the image.
|
||||||
whale to say. So, the first step is to install it. This line installs the
|
|
||||||
software into the image.
|
|
||||||
|
|
||||||
8. Once the image has the software it needs, you instruct the software to run
|
8. Once the image has the software it needs, you instruct the software to run
|
||||||
when the image is loaded.
|
when the image is loaded.
|
||||||
|
|
|
@ -47,7 +47,6 @@ Docker for Windows is our newest offering for PCs. It runs as a native Windows a
|
||||||
|
|
||||||
<a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a>
|
<a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a>
|
||||||
|
|
||||||
|
|
||||||
#### Install Prequisites
|
#### Install Prequisites
|
||||||
|
|
||||||
* 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.
|
* 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.
|
||||||
|
@ -63,7 +62,7 @@ See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docke
|
||||||
### Docker for Linux
|
### Docker for Linux
|
||||||
Docker Engine runs navitvely on Linux distributions.
|
Docker Engine runs navitvely on Linux distributions.
|
||||||
|
|
||||||
For full instructions on getting Docker for various Linux distributions, see [Install Docker Engine](../installation/index.md).
|
For full instructions on getting Docker for various Linux distributions, see [Install Docker Engine](/engine/installation/index.md).
|
||||||
|
|
||||||
## Step 2: Install Docker
|
## Step 2: Install Docker
|
||||||
|
|
||||||
|
@ -75,7 +74,7 @@ For full instructions on getting Docker for various Linux distributions, see [In
|
||||||
|
|
||||||
* 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).
|
* 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).
|
||||||
|
|
||||||
For full install instructions for Docker on Linux, see [Install Docker Engine](../installation/index.md) and select the flavor of Linux you want to use.
|
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.
|
||||||
|
|
||||||
## Step 3: Verify your installation
|
## Step 3: Verify your installation
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue