Skip to content

Commit eda11f9

Browse files
ENGDOCS-2586 (#22496)
<!--Delete sections as needed --> ## Description Freshness on some Compose sections ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Co-authored-by: Sarah Sanders <sarah.sanders@docker.com>
1 parent ad49ff4 commit eda11f9

File tree

9 files changed

+66
-89
lines changed

9 files changed

+66
-89
lines changed

content/manuals/compose/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ grid:
4040
description: Explore general FAQs and find out how to give feedback.
4141
icon: help
4242
link: /compose/faq
43-
- title: Migrate to Compose V2
44-
description: Learn how to migrate from Compose V1 to V2
43+
- title: Migrate to Compose v2
44+
description: Learn how to migrate from Compose v1 to v2
4545
icon: folder_delete
4646
link: /compose/releases/migrate/
4747
aliases:
@@ -55,7 +55,7 @@ aliases:
5555
Docker Compose is a tool for defining and running multi-container applications.
5656
It is the key to unlocking a streamlined and efficient development and deployment experience.
5757

58-
Compose simplifies the control of your entire application stack, making it easy to manage services, networks, and volumes in a single, comprehensible YAML configuration file. Then, with a single command, you create and start all the services
58+
Compose simplifies the control of your entire application stack, making it easy to manage services, networks, and volumes in a single YAML configuration file. Then, with a single command, you create and start all the services
5959
from your configuration file.
6060

6161
Compose works in all environments; production, staging, development, testing, as

content/manuals/compose/gettingstarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ Using the Flask framework, the application features a hit counter in Redis, prov
1616

1717
The concepts demonstrated here should be understandable even if you're not familiar with Python.
1818

19-
This is a non-normative example that just highlights the key things you can do with Compose.
19+
This is a non-normative example that demonstrates core Compose functionality.
2020

2121
## Prerequisites
2222

2323
Make sure you have:
2424

25-
- Installed the latest version of Docker Compose
25+
- [Installed the latest version of Docker Compose](/manuals/compose/install/_index.md)
2626
- A basic understanding of Docker concepts and how Docker works
2727

2828
## Step 1: Set up

content/manuals/compose/intro/compose-application-model.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Services store and share persistent data into [volumes](/reference/compose-file/
2323

2424
Some services require configuration data that is dependent on the runtime or platform. For this, the Specification defines a dedicated [configs](/reference/compose-file/configs.md) concept. From a service container point of view, configs are comparable to volumes, in that they are files mounted into the container. But the actual definition involves distinct platform resources and services, which are abstracted by this type.
2525

26-
A [secret](/reference/compose-file/secrets.md) is a specific flavor of configuration data for sensitive data that should not be exposed without security considerations. Secrets are made available to services as files mounted into their containers, but the platform-specific resources to provide sensitive data are specific enough to deserve a distinct concept and definition within the Compose specification.
26+
A [secret](/reference/compose-file/secrets.md) is a specific flavor of configuration data for sensitive data that should not be exposed without security considerations. Secrets are made available to services as files mounted into their containers, but the platform-specific resources to provide sensitive data are specific enough to deserve a distinct concept and definition within the Compose Specification.
2727

2828
> [!NOTE]
2929
>
@@ -77,7 +77,7 @@ If you want to monitor the output of your running containers and debug issues, y
7777
$ docker compose logs
7878
```
7979

80-
To lists all the services along with their current status:
80+
To list all the services along with their current status:
8181

8282
```console
8383
$ docker compose ps
@@ -148,7 +148,7 @@ networks:
148148
back-tier: {}
149149
```
150150
151-
The `docker compose up` command starts the `frontend` and `backend` services, create the necessary networks and volumes, and injects the configuration and secret into the frontend service.
151+
The `docker compose up` command starts the `frontend` and `backend` services, creates the necessary networks and volumes, and injects the configuration and secret into the frontend service.
152152

153153
`docker compose ps` provides a snapshot of the current state of your services, making it easy to see which containers are running, their status, and the ports they are using:
154154

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: History and development of Docker Compose
33
linkTitle: History and development
4-
description: History of Compose V1 and Compose YAML schema versioning
4+
description: History of Compose v1 and Compose YAML schema versioning
55
keywords: compose, compose yaml, swarm, migration, compatibility, docker compose vs docker-compose
66
weight: 30
77
aliases:
@@ -10,14 +10,14 @@ aliases:
1010

1111
This page provides:
1212
- A brief history of the development of the Docker Compose CLI
13-
- A clear explanation of the major versions and file formats that make up Compose V1 and Compose V2
14-
- The main differences between Compose V1 and Compose V2
13+
- A clear explanation of the major versions and file formats that make up Compose v1 and Compose v2
14+
- The main differences between Compose V1 and Compose v2
1515

1616
## Introduction
1717

18-
![Image showing the main differences between Compose V1 and Compose V2](../images/v1-versus-v2.png)
18+
![Image showing the main differences between Compose v1 and Compose v2](../images/v1-versus-v2.png)
1919

20-
The image above shows that the currently supported version of the Docker Compose CLI is Compose V2 which is defined by the [Compose Specification](/reference/compose-file/_index.md).
20+
The previous image shows that the currently supported version of the Docker Compose CLI is Compose v2 which is defined by the [Compose Specification](/reference/compose-file/_index.md).
2121

2222
It also provides a quick snapshot of the differences in file formats, command-line syntax, and top-level elements. This is covered in more detail in the following sections.
2323

@@ -27,7 +27,7 @@ Version one of the Docker Compose command-line binary was first released in 2014
2727
Typically, Compose V1 projects include a top-level `version` element in the `compose.yaml` file, with values ranging from `2.0` to `3.8`, which refer to the specific [file formats](#compose-file-format-versioning).
2828

2929
Version two of the Docker Compose command-line binary was announced in 2020, is written in Go, and is invoked with `docker compose`.
30-
Compose V2 ignores the `version` top-level element in the `compose.yaml` file.
30+
Compose v2 ignores the `version` top-level element in the `compose.yaml` file.
3131

3232
### Compose file format versioning
3333

@@ -39,12 +39,12 @@ Three major versions of the Compose file format for Compose V1 were released:
3939
- Compose file format 3.x with Compose 1.10.0 in 2017
4040

4141
Compose file format 1 is substantially different to all the following formats as it lacks a top-level `services` key.
42-
Its usage is historical and files written in this format don't run with Compose V2.
42+
Its usage is historical and files written in this format don't run with Compose v2.
4343

4444
Compose file format 2.x and 3.x are very similar to each other, but the latter introduced many new options targeted at Swarm deployments.
4545

4646
To address confusion around Compose CLI versioning, Compose file format versioning, and feature parity depending on whether Swarm mode was in use, file format 2.x and 3.x were merged into the [Compose Specification](/reference/compose-file/_index.md).
4747

48-
Compose V2 uses the Compose Specification for project definition. Unlike the prior file formats, the Compose Specification is rolling and makes the `version` top-level element optional. Compose V2 also makes use of optional specifications - [Deploy](/reference/compose-file/deploy.md), [Develop](/reference/compose-file/develop.md) and [Build](/reference/compose-file/build.md).
48+
Compose v2 uses the Compose Specification for project definition. Unlike the prior file formats, the Compose Specification is rolling and makes the `version` top-level element optional. Compose v2 also makes use of optional specifications - [Deploy](/reference/compose-file/deploy.md), [Develop](/reference/compose-file/develop.md), and [Build](/reference/compose-file/build.md).
4949

50-
To make [migration](/manuals/compose/releases/migrate.md) easier, Compose V2 has backwards compatibility for certain elements that have been deprecated or changed between Compose file format 2.x/3.x and the Compose Specification.
50+
To make [migration](/manuals/compose/releases/migrate.md) easier, Compose v2 has backwards compatibility for certain elements that have been deprecated or changed between Compose file format 2.x/3.x and the Compose Specification.

0 commit comments

Comments
 (0)