Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compose V2.0.0 #13474

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -22,7 +22,7 @@ exclude: ["_samples", "_scripts", "404.html", "datacenter", "ee", "index.html",
# You can't have - characters in these for non-YAML reasons
latest_engine_api_version: "1.41"
docker_ce_version: "20.10"
compose_version: "1.29.2"
compose_version: "2.0.0"
compose_file_v3: "3.9"
compose_file_v2: "2.4"
machine_version: "0.16.0"
Expand Down
16 changes: 6 additions & 10 deletions _data/toc.yaml
Expand Up @@ -1099,11 +1099,7 @@ reference:
- sectiontitle: Compose file reference
section:
- path: /compose/compose-file/
title: Compose Specification
- path: /compose/compose-file/compose-file-v3/
title: Version 3
- path: /compose/compose-file/compose-file-v2/
title: Version 2
title: Compose file reference
- path: /compose/compose-file/compose-versioning/
title: About versions and upgrading
- path: /compose/faq/
Expand Down Expand Up @@ -1311,12 +1307,12 @@ manuals:
section:
- path: /compose/
title: Overview of Docker Compose
- sectiontitle: Compose V2
- sectiontitle: Compose V1
section:
- path: /compose/cli-command/
title: Overview
- path: /compose/cli-command-compatibility/
title: Compose v2 compatibility
- path: /compose/transition/
title: Transition
- path: /compose/compatibility/
title: Compatibility
- path: /compose/install/
title: Install Compose
- path: /compose/gettingstarted/
Expand Down
3 changes: 0 additions & 3 deletions _includes/content/compose-extfields-sub.md
Expand Up @@ -9,7 +9,6 @@ your Compose file and their name start with the `x-` character sequence.
> of service, volume, network, config and secret definitions.

```yaml
version: "{{ site.compose_file_v3 }}"
x-custom:
items:
- a
Expand All @@ -35,7 +34,6 @@ logging:
You may write your Compose file as follows:

```yaml
version: "{{ site.compose_file_v3 }}"
x-logging:
&default-logging
options:
Expand All @@ -56,7 +54,6 @@ It is also possible to partially override values in extension fields using
the [YAML merge type](https://yaml.org/type/merge.html). For example:

```yaml
version: "{{ site.compose_file_v3 }}"
x-volumes:
&default-volume
driver: foobar-storage
Expand Down
29 changes: 0 additions & 29 deletions _includes/content/compose-matrix.md

This file was deleted.

72 changes: 0 additions & 72 deletions compose/cli-command.md

This file was deleted.

File renamed without changes.
9 changes: 2 additions & 7 deletions compose/compose-file/compose-file-v2.md
Expand Up @@ -10,13 +10,8 @@ toc_min: 1

These topics describe version 2 of the Compose file format.

## Compose and Docker compatibility matrix

There are several versions of the Compose file format – 1, 2, 2.x, and 3.x. The
table below is a quick look. For full details on what each version includes and
how to upgrade, see **[About versions and upgrading](compose-versioning.md)**.

{% include content/compose-matrix.md %}
Compose file version 2 is obsolete, better refere to the [Compose Specification](https://github.com/compose-spec/compose-spec/blob/master/spec.md). See [Compose file versions and upgrading](compose-versioning.md)
{: .important}

## Service configuration reference

Expand Down
8 changes: 2 additions & 6 deletions compose/compose-file/compose-file-v3.md
Expand Up @@ -11,13 +11,9 @@ toc_min: 1
These topics describe version 3 of the Compose file format. This is the newest
version.

## Compose and Docker compatibility matrix

There are several versions of the Compose file format – 1, 2, 2.x, and 3.x. The
table below is a quick look. For full details on what each version includes and
how to upgrade, see **[About versions and upgrading](compose-versioning.md)**.
Compose file version 2 is obsolete, better refere to the [Compose Specification](https://github.com/compose-spec/compose-spec/blob/master/spec.md). See [Compose file versions and upgrading](compose-versioning.md)
{: .important}

{% include content/compose-matrix.md %}

## Compose file structure and examples

Expand Down