From 5915105a5dcb5930cad860295ca62b89c0caa225 Mon Sep 17 00:00:00 2001 From: k-kbk Date: Thu, 27 Mar 2025 21:23:15 +0900 Subject: [PATCH 1/2] fix: replace docker-compose.yml with compose.yaml Signed-off-by: k-kbk --- docs/reference/docker_compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/docker_compose.yaml b/docs/reference/docker_compose.yaml index a31cb41082e..58ec47802a5 100644 --- a/docs/reference/docker_compose.yaml +++ b/docs/reference/docker_compose.yaml @@ -241,10 +241,10 @@ examples: |- For example, consider this command line: ```console - $ docker compose -f docker-compose.yml -f docker-compose.admin.yml run backup_db + $ docker compose -f compose.yaml -f compose.admin.yaml run backup_db ``` - The `docker-compose.yml` file might specify a `webapp` service. + The `compose.yaml` file might specify a `webapp` service. ```yaml services: @@ -255,7 +255,7 @@ examples: |- volumes: - "/data" ``` - If the `docker-compose.admin.yml` also specifies this same service, any matching fields override the previous file. + If the `compose.admin.yaml` also specifies this same service, any matching fields override the previous file. New values, add to the `webapp` service configuration. ```yaml From b9083050b958734deab2dfd57a4d0606d42a996b Mon Sep 17 00:00:00 2001 From: k-kbk Date: Thu, 27 Mar 2025 23:15:01 +0900 Subject: [PATCH 2/2] fix: replace docker-compose.yml with compose.yaml Signed-off-by: k-kbk --- docs/reference/compose.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/reference/compose.md b/docs/reference/compose.md index cf858c1767e..d1a1c2a4627 100644 --- a/docs/reference/compose.md +++ b/docs/reference/compose.md @@ -78,10 +78,10 @@ to their predecessors. For example, consider this command line: ```console -$ docker compose -f docker-compose.yml -f docker-compose.admin.yml run backup_db +$ docker compose -f compose.yaml -f compose.admin.yaml run backup_db ``` -The `docker-compose.yml` file might specify a `webapp` service. +The `compose.yaml` file might specify a `webapp` service. ```yaml services: @@ -92,7 +92,7 @@ services: volumes: - "/data" ``` -If the `docker-compose.admin.yml` also specifies this same service, any matching fields override the previous file. +If the `compose.admin.yaml` also specifies this same service, any matching fields override the previous file. New values, add to the `webapp` service configuration. ```yaml @@ -207,4 +207,4 @@ $ docker compose --dry-run up --build -d From the example above, you can see that the first step is to pull the image defined by `db` service, then build the `backend` service. Next, the containers are created. The `db` service is started, and the `backend` and `proxy` wait until the `db` service is healthy before starting. -Dry Run mode works with almost all commands. You cannot use Dry Run mode with a command that doesn't change the state of a Compose stack such as `ps`, `ls`, `logs` for example. +Dry Run mode works with almost all commands. You cannot use Dry Run mode with a command that doesn't change the state of a Compose stack such as `ps`, `ls`, `logs` for example.