diff --git a/_config.yml b/_config.yml index f140714cf6..56a8fb28f2 100644 --- a/_config.yml +++ b/_config.yml @@ -45,7 +45,7 @@ exclude: latest_engine_api_version: "1.43" docker_ce_version: "24.0.0" compose_v1_version: "1.29.2" -compose_version: "v2.18.1" +compose_version: "v2.19.0" compose_file_v3: "3.8" compose_file_v2: "2.4" machine_version: "0.16.0" diff --git a/_data/compose-cli/docker_compose.yaml b/_data/compose-cli/docker_compose.yaml index e999c99307..1f3a49ebd8 100644 --- a/_data/compose-cli/docker_compose.yaml +++ b/_data/compose-cli/docker_compose.yaml @@ -118,7 +118,6 @@ long: |- Setting the `COMPOSE_IGNORE_ORPHANS` environment variable to `true` will stop docker compose from detecting orphaned containers for the project. - ### Use Dry Run mode to test your command Use `--dry-run` flag to test a command without changing your application stack state. @@ -142,26 +141,7 @@ long: |- 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 does not currently work with all commands. In particular, 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. - - Here the list of commands supporting `--dry-run` flag: - * build - * cp - * create - * down - * exec - * kill - * pause - * pull - * push - * remove - * restart - * run - * start - * stop - * unpause - * up + 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. usage: docker compose pname: docker plink: docker.yaml @@ -300,6 +280,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: progress + value_type: string + default_value: auto + description: Set type of progress output (auto, tty, plain, quiet) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: project-directory value_type: string description: |- diff --git a/_data/compose-cli/docker_compose_build.yaml b/_data/compose-cli/docker_compose_build.yaml index 01f5ad2bb7..efab6c055f 100644 --- a/_data/compose-cli/docker_compose_build.yaml +++ b/_data/compose-cli/docker_compose_build.yaml @@ -90,9 +90,9 @@ options: - option: progress value_type: string default_value: auto - description: Set type of progress output (auto, tty, plain, quiet) + description: Set type of ui output (auto, tty, plain, quiet) deprecated: false - hidden: false + hidden: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/compose-cli/docker_compose_down.yaml b/_data/compose-cli/docker_compose_down.yaml index bb1ac314b3..69b802f0fc 100644 --- a/_data/compose-cli/docker_compose_down.yaml +++ b/_data/compose-cli/docker_compose_down.yaml @@ -14,7 +14,7 @@ long: |- Anonymous volumes are not removed by default. However, as they don’t have a stable name, they will not be automatically mounted by a subsequent `up`. For data that needs to persist between updates, use explicit paths as bind mounts or named volumes. -usage: docker compose down [OPTIONS] +usage: docker compose down [OPTIONS] [SERVICES] pname: docker compose plink: docker_compose.yaml options: @@ -41,7 +41,7 @@ options: - option: timeout shorthand: t value_type: int - default_value: "10" + default_value: "0" description: Specify a shutdown timeout in seconds deprecated: false hidden: false @@ -54,7 +54,7 @@ options: value_type: bool default_value: "false" description: | - Remove named volumes declared in the `volumes` section of the Compose file and anonymous volumes attached to containers. + Remove named volumes declared in the "volumes" section of the Compose file and anonymous volumes attached to containers. deprecated: false hidden: false experimental: false diff --git a/_data/compose-cli/docker_compose_restart.yaml b/_data/compose-cli/docker_compose_restart.yaml index b5ecfb2893..055daedd13 100644 --- a/_data/compose-cli/docker_compose_restart.yaml +++ b/_data/compose-cli/docker_compose_restart.yaml @@ -28,7 +28,7 @@ options: - option: timeout shorthand: t value_type: int - default_value: "10" + default_value: "0" description: Specify a shutdown timeout in seconds deprecated: false hidden: false diff --git a/_data/compose-cli/docker_compose_run.yaml b/_data/compose-cli/docker_compose_run.yaml index 666e758c59..9e6c9a07b6 100644 --- a/_data/compose-cli/docker_compose_run.yaml +++ b/_data/compose-cli/docker_compose_run.yaml @@ -3,7 +3,7 @@ short: Run a one-off command on a service. long: |- Runs a one-time command against a service. - The following command starts the `web` service and runs `bash` as its command: + the following command starts the `web` service and runs `bash` as its command: ```console $ docker compose run web bash @@ -68,6 +68,24 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: cap-add + value_type: list + description: Add Linux capabilities + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: cap-drop + value_type: list + description: Drop Linux capabilities + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: detach shorthand: d value_type: bool diff --git a/_data/compose-cli/docker_compose_stop.yaml b/_data/compose-cli/docker_compose_stop.yaml index 9cc5258b92..f7870be4f3 100644 --- a/_data/compose-cli/docker_compose_stop.yaml +++ b/_data/compose-cli/docker_compose_stop.yaml @@ -9,7 +9,7 @@ options: - option: timeout shorthand: t value_type: int - default_value: "10" + default_value: "0" description: Specify a shutdown timeout in seconds deprecated: false hidden: false diff --git a/_data/compose-cli/docker_compose_up.yaml b/_data/compose-cli/docker_compose_up.yaml index 1c46ca79ab..b59af84967 100644 --- a/_data/compose-cli/docker_compose_up.yaml +++ b/_data/compose-cli/docker_compose_up.yaml @@ -234,7 +234,7 @@ options: - option: timeout shorthand: t value_type: int - default_value: "10" + default_value: "0" description: | Use this timeout in seconds for container shutdown when attached or when containers are already running. deprecated: false