docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated tutorial tables, added links to 1.13.0 blog post 

copyedits

updated link to Compose file to go directly to V3 topic

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-01-20 15:51:42 -08:00
parent 9988a6bd0d
commit 2338cb5c34
4 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/getstarted-voting-app/customize-app.md
View File

@ -69,6 +69,10 @@ did not change.
## Resources ## Resources
* [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/) blog post
from [Docker Core Engineering](https://blog.docker.com/author/core_eng/)
* A deeper dive voting app walkthrough is available on * A deeper dive voting app walkthrough is available on
[Docker Labs](https://github.com/docker/labs/) as [Deploying an app to a Swarm](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md). [Docker Labs](https://github.com/docker/labs/) as [Deploying an app to a Swarm](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md).
The lab walkthrough provides more technical detail on deployment configuration, The lab walkthrough provides more technical detail on deployment configuration,

15
engine/getstarted-voting-app/index.md
View File

@ -8,9 +8,9 @@ This example is built around a web-based voting application that collects,
tallies, and returns the results of votes (for cats and dogs, or other choices tallies, and returns the results of votes (for cats and dogs, or other choices
you specify). The voting app includes several services, each one running in its you specify). The voting app includes several services, each one running in its
own container. We'll deploy the app as a _stack_ to introduce some new concepts own container. We'll deploy the app as a _stack_ to introduce some new concepts
surfaced in [Compose Version 3](/compose/compose-file.md), and also use [swarm surfaced in [Compose Version 3](/compose/compose-file.md#version-3), and also
mode](/engine/swarm/index.md), which is cluster management and orchestration use [swarm mode](/engine/swarm/index.md), which is cluster management and
capability built into Docker Engine. orchestration capability built into Docker Engine.
## Got Docker? ## Got Docker?
@ -255,12 +255,11 @@ as Docker stacks and services.
### Compose file reference ### Compose file reference
For more on what's new in Compose Version 3 and how to upgrade, see these topics For more on what's new in Compose Version 3:
in the [Compose file reference](/compose/compose-file.md):
* [Versioning](/compose/compose-file.md#versioning) * [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/) blog post from [Docker Core Engineering](https://blog.docker.com/author/core_eng/)
* [Version 3](/compose/compose-file.md#version-3)
* [Upgrading](/compose/compose-file.md#upgrading) * [Versioning](/compose/compose-file.md#versioning), [Version 3](/compose/compose-file.md#version-3), and [Upgrading](/compose/compose-file.md#upgrading) in [Compose file reference](/compose/compose-file.md)
## What's next? ## What's next?

37
index.md
View File

@ -8,27 +8,42 @@ title: Docker Documentation
Docker packages your app with its dependencies, freeing you from worrying about your Docker packages your app with its dependencies, freeing you from worrying about your
system configuration, and making your app more portable. system configuration, and making your app more portable.
<table><tr><td width="50%"> <table>
<tr valign="top">
<td width="50%">
{% capture basics %} {% capture basics %}
## Learn the basics of Docker ## Learn the basics of Docker
The basic tutorial teaches you about how to build, push, and pull Docker images, The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push,
and run them as containers. This tutorial stops short of teaching you how to and pull Docker images, and run them as containers. This
deploy applications. tutorial stops short of teaching you how to deploy applications.
[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
{% endcapture %}{{ basics | markdownify }} {% endcapture %}{{ basics | markdownify }}
</td><td width="50%"> </td>
<td width="50%">
{% capture apps %} {% capture apps %}
## Define and deploy applications ## Define and deploy applications
The application tutorial teaches you how to relate containers to each other and The define-and-deploy tutorial shows how to relate
define them as part of an application that is ready to deploy at scale in a containers to each other and define them as services in an application that is ready to deploy at scale in a
production environment. production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode.
{% endcapture %}{{ apps | markdownify }}
</td></tr>
<tr valign="top">
<td width="50%">
{% capture basics %}
[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
{% endcapture %}{{ basics | markdownify }}
</td>
<td width="50%">
{% capture apps %}
[Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"} [Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"}
{% endcapture %}{{ apps | markdownify }} {% endcapture %}{{ apps | markdownify }}
</td></tr></table> </td>
</tr>
</table>
{% include content/typical_docker_workflow.md %} {% include content/typical_docker_workflow.md %}

37
learn.md
View File

@ -7,24 +7,39 @@ redirect_from:
In this section, you can explore various ways to get up to speed on In this section, you can explore various ways to get up to speed on
Docker workflows. Docker workflows.
<table><tr><td width="50%"> <table>
<tr valign="top">
<td width="50%">
{% capture basics %} {% capture basics %}
## Learn the basics of Docker ## Learn the basics of Docker
The basic tutorial teaches you about how to build, push, and pull Docker images, The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push,
and run them as containers. This tutorial stops short of teaching you how to and pull Docker images, and run them as containers. This
deploy applications. tutorial stops short of teaching you how to deploy applications.
[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
{% endcapture %}{{ basics | markdownify }} {% endcapture %}{{ basics | markdownify }}
</td><td width="50%"> </td>
<td width="50%">
{% capture apps %} {% capture apps %}
## Define and deploy applications ## Define and deploy applications
The application tutorial teaches you how to relate containers to each other and The define-and-deploy tutorial shows how to relate
define them as part of an application that is ready to deploy at scale in a containers to each other and define them as services in an application that is ready to deploy at scale in a
production environment. production environment. Highlights [Compose Version 3 new features](/engine/getstarted-voting-app/index.md#compose-version-3-features-and-compatibility) and swarm mode.
{% endcapture %}{{ apps | markdownify }}
</td></tr>
<tr valign="top">
<td width="50%">
{% capture basics %}
[Start the basic tutorial](/engine/getstarted/){: class="button darkblue-btn"}
{% endcapture %}{{ basics | markdownify }}
</td>
<td width="50%">
{% capture apps %}
[Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"} [Start the application tutorial](/engine/getstarted-voting-app/){: class="button darkblue-btn"}
{% endcapture %}{{ apps | markdownify }} {% endcapture %}{{ apps | markdownify }}
</td></tr></table> </td>
</tr>
</table>