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

copyedits and improvements to Compose reference 

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-02-09 19:40:27 -08:00
parent 161fb51b1c
commit 2b7c238b0c
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
_data/toc.yaml
View File

@ -783,12 +783,14 @@ toc:
title: Docker Stacks and Distributed Application Bundles title: Docker Stacks and Distributed Application Bundles
- path: /compose/swarm/ - path: /compose/swarm/
title: Using Compose with Swarm title: Using Compose with Swarm
- path: /compose/django/ - sectiontitle: Quickstart examples
title: "Quickstart: Compose and Django" section:
- path: /compose/rails/ - path: /compose/django/
title: "Quickstart: Compose and Rails" title: "Quickstart: Compose and Django"
- path: /compose/wordpress/ - path: /compose/rails/
title: "Quickstart: Compose and WordPress" title: "Quickstart: Compose and Rails"
- path: /compose/wordpress/
title: "Quickstart: Compose and WordPress"
- path: /compose/env-file/ - path: /compose/env-file/
title: Environment file title: Environment file
- path: /compose/environment-variables/ - path: /compose/environment-variables/
@ -802,11 +804,11 @@ toc:
- sectiontitle: Compose File Reference - sectiontitle: Compose File Reference
section: section:
- path: /compose/compose-file/ - path: /compose/compose-file/
title: Version 3 reference title: Version 3
- path: /compose/compose-file/compose-file-v2/ - path: /compose/compose-file/compose-file-v2/
title: Version 2 reference title: Version 2
- path: /compose/compose-file/compose-file-v1/ - path: /compose/compose-file/compose-file-v1/
title: Version 1 reference title: Version 1
- path: /compose/compose-file/compose-versioning/ - path: /compose/compose-file/compose-versioning/
title: About versions and upgrading title: About versions and upgrading
- sectiontitle: Command-line Reference - sectiontitle: Command-line Reference

23
compose/compose-file/compose-versioning.md
View File

@ -7,15 +7,16 @@ title: Compose file versions and upgrading
The Compose file is a [YAML](http://yaml.org/) file defining services, The Compose file is a [YAML](http://yaml.org/) file defining services,
networks, and volumes for a Docker application. networks, and volumes for a Docker application.
Thes Compose file formats are now specified in these references, specific to each version. The Compose file formats are now specified in these references, specific to each version.
- [Version 3](index.md) (most current, and recommended) | **Reference file** | **What changed in this version** |
| ------------------- | ------------------ |
|[Version 3](index.md) (most current, and recommended) |[Version 3 updates](#version-3) |
| [Version 2](compose-file-v2.md) |[Version 2 updates](#version-2) |
| [Version 1](compose-file-v1.md) | [Version 1 updates](#version-1) |
- [Version 2](compose-file-v2.md) The topics below explain the differences among the versions, Docker Engine
compatibility, and [how to upgrade](#upgrading).
- [Version 1](compose-file-v1.md)
The topics below explain the differences among the versions, Docker Engine compatibility, and how to upgrade.
## Compatibility matrix ## Compatibility matrix
@ -146,9 +147,9 @@ A more extended example, defining volumes and networks:
Several other options were added to support networking, such as: Several other options were added to support networking, such as:
* aliases * [`aliases`](compose-file-v2.md#aliases)
* The `depends_on` option can be used in place of links to indicate dependencies * The [`depends_on`](compose-file-v2.md#dependson) option can be used in place of links to indicate dependencies
between services and startup order. between services and startup order.
version: '2' version: '2'
@ -163,9 +164,9 @@ between services and startup order.
db: db:
image: postgres image: postgres
* ipv4_address, ipv6_address * [`ipv4_address`, `ipv6_address`](compose-file-v2.md#ipv4address-ipv6address)
[Variable substitution](compose-file-v2.md#variable-substitution) was added in Version 2. [Variable substitution](compose-file-v2.md#variable-substitution) also was added in Version 2.
### Version 2.1 ### Version 2.1