Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions content/manuals/compose/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ grid:
description: Explore general FAQs and find out how to give feedback.
icon: help
link: /compose/faq
- title: Migrate to Compose V2
description: Learn how to migrate from Compose V1 to V2
- title: Migrate to Compose v2
description: Learn how to migrate from Compose v1 to v2
icon: folder_delete
link: /compose/releases/migrate/
aliases:
Expand All @@ -55,7 +55,7 @@ aliases:
Docker Compose is a tool for defining and running multi-container applications.
It is the key to unlocking a streamlined and efficient development and deployment experience.

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
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
from your configuration file.

Compose works in all environments; production, staging, development, testing, as
Expand Down
4 changes: 2 additions & 2 deletions content/manuals/compose/gettingstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Using the Flask framework, the application features a hit counter in Redis, prov

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

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

## Prerequisites

Make sure you have:

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

## Step 1: Set up
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/compose/intro/compose-application-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Services store and share persistent data into [volumes](/reference/compose-file/

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.

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.
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.

> [!NOTE]
>
Expand Down Expand Up @@ -77,7 +77,7 @@ If you want to monitor the output of your running containers and debug issues, y
$ docker compose logs
```

To lists all the services along with their current status:
To list all the services along with their current status:

```console
$ docker compose ps
Expand Down Expand Up @@ -148,7 +148,7 @@ networks:
back-tier: {}
```

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.
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.

`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:

Expand Down
18 changes: 9 additions & 9 deletions content/manuals/compose/intro/history.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: History and development of Docker Compose
linkTitle: History and development
description: History of Compose V1 and Compose YAML schema versioning
description: History of Compose v1 and Compose YAML schema versioning
keywords: compose, compose yaml, swarm, migration, compatibility, docker compose vs docker-compose
weight: 30
aliases:
Expand All @@ -10,14 +10,14 @@ aliases:

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

## Introduction

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

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).
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).

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.

Expand All @@ -27,7 +27,7 @@ Version one of the Docker Compose command-line binary was first released in 2014
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).

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

### Compose file format versioning

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

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

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.

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).

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).
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).

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.
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.
Loading