mirror of https://github.com/docker/docs.git
Remove references to v1 from other topics
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
parent
55b4fb8f37
commit
5c64b4230a
|
@ -998,7 +998,7 @@ options:
|
|||
|
||||
> Changed in [version 2](compose-versioning.md#version-2) file format.
|
||||
>
|
||||
> The `network_mode` option replaces the version 1 [net](compose-file-v1.md#net) option.
|
||||
> The `network_mode` option replaces the Compose file version 1 net option.
|
||||
|
||||
Network mode. Use the same values as the docker client `--network` parameter, plus
|
||||
the special form `service:[service name]`.
|
||||
|
@ -1023,7 +1023,7 @@ network_mode: "container:[container name/id]"
|
|||
|
||||
> Changed in [version 2](compose-versioning.md#version-2) file format.
|
||||
>
|
||||
> The `networks` option replaces the version 1 [net](compose-file-v1.md#net) option.
|
||||
> The `networks` option replaces the Compose file version 1 net option.
|
||||
|
||||
Networks to join, referencing entries under the
|
||||
[top-level `networks` key](#network-configuration-reference).
|
||||
|
|
|
@ -14,7 +14,7 @@ The Compose file formats are now described in these references, specific to each
|
|||
| [Compose Specification](index.md) (most current, and recommended) | [Versioning](compose-versioning.md#versioning) |
|
||||
| [Version 3](compose-file-v3.md) | [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 1 (Deprecated) | [Version 1 updates](#version-1) |
|
||||
|
||||
The topics below explain the differences among the versions, Docker Engine
|
||||
compatibility, and [how to upgrade](#upgrading).
|
||||
|
@ -79,7 +79,7 @@ Several things differ depending on which version you use:
|
|||
|
||||
These differences are explained below.
|
||||
|
||||
### Version 1
|
||||
### Version 1 (Deprecated)
|
||||
|
||||
Compose files that do not declare a version are considered "version 1". In those
|
||||
files, all the [services](compose-file-v3.md#service-configuration-reference) are
|
||||
|
@ -95,7 +95,7 @@ Version 1 files cannot declare named
|
|||
Compose does not take advantage of [networking](../networking.md) when you
|
||||
use version 1: every container is placed on the default `bridge` network and is
|
||||
reachable from every other container at its IP address. You need to use
|
||||
[links](compose-file-v1.md#links) to enable discovery between containers.
|
||||
`links` to enable discovery between containers.
|
||||
|
||||
Example:
|
||||
|
||||
|
@ -537,9 +537,7 @@ flag with the `config` command.
|
|||
> resulting configuration is only an approximate using non-Swarm mode
|
||||
> properties, it may produce unexpected results.
|
||||
|
||||
|
||||
## Compose file format references
|
||||
- [Compose Specification](index.md)
|
||||
- [Compose file version 3](compose-file-v3.md)
|
||||
- [Compose file version 2](compose-file-v2.md)
|
||||
- [Compose file version 1](compose-file-v1.md)
|
||||
- [Compose file version 2](compose-file-v2.md)
|
|
@ -193,10 +193,3 @@ no Docker Compose entry for `environment` or `env_file`.
|
|||
Several environment variables are available for you to configure the Docker
|
||||
Compose command-line behavior. They begin with `COMPOSE_` or `DOCKER_`, and are
|
||||
documented in [CLI Environment Variables](reference/envvars.md).
|
||||
|
||||
## Environment variables created by links
|
||||
|
||||
When using the ['links' option](compose-file/compose-file-v3.md#links) in a
|
||||
[v1 Compose file](compose-file/compose-file-v1.md#link-environment-variables),
|
||||
environment variables are created for each link. These variables are deprecated.
|
||||
Use the link alias as a hostname instead.
|
||||
|
|
|
@ -174,8 +174,7 @@ $ docker-compose -f docker-compose.yml -f docker-compose.admin.yml \
|
|||
> **Note**
|
||||
>
|
||||
> The `extends` keyword is supported in earlier Compose file formats up to Compose
|
||||
> file version 2.1 (see [extends in v1](compose-file/compose-file-v1.md#extends)
|
||||
> and [extends in v2](compose-file/compose-file-v2.md#extends)), but is
|
||||
> file version 2.1 (see [extends in v2](compose-file/compose-file-v2.md#extends)), but is
|
||||
> not supported in Compose version 3.x. See the [Version 3 summary](compose-file/compose-versioning.md#version-3)
|
||||
> of keys added and removed, along with information on [how to upgrade](compose-file/compose-versioning.md#upgrading).
|
||||
> See [moby/moby#31101](https://github.com/moby/moby/issues/31101) to follow the
|
||||
|
|
|
@ -4,7 +4,7 @@ keywords: documentation, docs, docker, compose, orchestration, containers, netwo
|
|||
title: Networking in Compose
|
||||
---
|
||||
|
||||
> This page applies to Compose file formats [version 2](compose-file/compose-file-v2.md) and [higher](compose-file/index.md). Networking features are not supported for Compose file [version 1 (legacy)](compose-file/compose-file-v1.md).
|
||||
> This page applies to Compose file formats [version 2](compose-file/compose-file-v2.md) and [higher](compose-file/index.md). Networking features are not supported for Compose file version 1 (deprecated).
|
||||
|
||||
By default Compose sets up a single
|
||||
[network](../engine/reference/commandline/network_create.md) for your app. Each
|
||||
|
|
Loading…
Reference in New Issue