From 001f6681924cd5be97197341eb51e561c7a15615 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Thu, 1 May 2025 11:11:10 +0300 Subject: [PATCH 1/3] Merge pull request #22528 from duffuniverse/fix-typos-in-build-dependent-images-manual Fix typos in the Build dependent images manual --- content/manuals/compose/how-tos/dependent-images.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manuals/compose/how-tos/dependent-images.md b/content/manuals/compose/how-tos/dependent-images.md index 238f27efb40..d62668548ac 100644 --- a/content/manuals/compose/how-tos/dependent-images.md +++ b/content/manuals/compose/how-tos/dependent-images.md @@ -9,12 +9,12 @@ weight: 50 To reduce push/pull time and image weight, a common practice for Compose applications is to have services share base layers as much as possible. You will typically select the same operating system base image for -all services. But you also can get one step further sharing image layers when your images share the same +all services. But you can also get one step further by sharing image layers when your images share the same system packages. The challenge to address is then to avoid repeating the exact same Dockerfile instruction in all services. For illustration, this page assumes you want all your services to be built with an `alpine` base -image and install system package `openssl`. +image and install the system package `openssl`. ## Multi-stage Dockerfile @@ -161,4 +161,4 @@ Bake can also be selected as the default builder by editing your `$HOME/.docker/ } ... } -``` \ No newline at end of file +``` From b116a7c74cae1150bd5ceb1476daab50ea58f090 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Thu, 1 May 2025 11:38:21 +0300 Subject: [PATCH 2/3] Fix typos in the "Pre-defined environment variables in Compose" manual (#22492) ## Description This pull request fixes stale Compose CLI documentation URLs and a few minor typos. --- .../compose/how-tos/environment-variables/envvars.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/manuals/compose/how-tos/environment-variables/envvars.md b/content/manuals/compose/how-tos/environment-variables/envvars.md index 88410e4ce6d..67d5929673f 100644 --- a/content/manuals/compose/how-tos/environment-variables/envvars.md +++ b/content/manuals/compose/how-tos/environment-variables/envvars.md @@ -50,7 +50,7 @@ Compose can set the project name in different ways. The level of precedence (fro 1. The `-p` command line flag 2. `COMPOSE_PROJECT_NAME` -3. The top level `name:` variable from the config file (or the last `name:` from +3. The top-level `name:` variable from the config file (or the last `name:` from a series of config files specified using `-f`) 4. The `basename` of the project directory containing the config file (or containing the first config file specified using `-f`) @@ -78,7 +78,7 @@ Specifies the path to a Compose file. Specifying multiple Compose files is suppo ``` The path separator can also be customized using [`COMPOSE_PATH_SEPARATOR`](#compose_path_separator). -See also the [command-line options overview](/reference/cli/docker/compose/_index.md#command-options-overview-and-help) and [using `-f` to specify name and path of one or more Compose files](/reference/cli/docker/compose/_index.md#use--f-to-specify-name-and-path-of-one-or-more-compose-files). +See also the [command-line options overview](/reference/cli/docker/compose/_index.md#command-options-overview-and-help) and [using `-f` to specify name and path of one or more Compose files](/reference/cli/docker/compose/_index.md#use--f-to-specify-the-name-and-path-of-one-or-more-compose-files). ### COMPOSE\_PROFILES @@ -86,18 +86,18 @@ Specifies one or more profiles to be enabled when `docker compose up` is run. Services with matching profiles are started as well as any services for which no profile has been defined. -For example, calling `docker compose up`with `COMPOSE_PROFILES=frontend` selects services with the +For example, calling `docker compose up` with `COMPOSE_PROFILES=frontend` selects services with the `frontend` profile as well as any services without a profile specified. If specifying multiple profiles, use a comma as a separator. -This following example enables all services matching both the `frontend` and `debug` profiles and services without a profile. +The following example enables all services matching both the `frontend` and `debug` profiles and services without a profile. ```console COMPOSE_PROFILES=frontend,debug ``` -See also [Using profiles with Compose](../profiles.md) and the [`--profile` command-line option](/reference/cli/docker/compose/_index.md#use---profile-to-specify-one-or-more-active-profiles). +See also [Using profiles with Compose](../profiles.md) and the [`--profile` command-line option](/reference/cli/docker/compose/_index.md#use-profiles-to-enable-optional-services). ### COMPOSE\_CONVERT\_WINDOWS\_PATHS @@ -179,7 +179,7 @@ When enabled, Compose displays a navigation menu where you can choose to open th - Supported values: - `true` or `1`, to enable - `false` or `0`, to disable -- Defaults to: `1` if you obtained Docker Compose through Docker Desktop, otherwise default is `0` +- Defaults to: `1` if you obtained Docker Compose through Docker Desktop, otherwise the default is `0` ### COMPOSE\_EXPERIMENTAL From 11f970ed5efc525f53f10526806a971adc7c3fd1 Mon Sep 17 00:00:00 2001 From: Eduardo Diaz Date: Thu, 1 May 2025 10:41:59 +0200 Subject: [PATCH 3/3] Update oci-artifact.md (#22489) ## Description Included the -y option to bypass interactive confirmation in the OCI artifact documentation ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- content/manuals/compose/how-tos/oci-artifact.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/content/manuals/compose/how-tos/oci-artifact.md b/content/manuals/compose/how-tos/oci-artifact.md index 33ce8042fc2..0791df4e6f6 100644 --- a/content/manuals/compose/how-tos/oci-artifact.md +++ b/content/manuals/compose/how-tos/oci-artifact.md @@ -141,3 +141,9 @@ Do you want to continue? [y/N]: y Your compose stack "oci://registry.example.com/stack:latest" is stored in "~/Library/Caches/docker-compose/964e715660d6f6c3b384e05e7338613795f7dcd3613890cfa57e3540353b9d6d" ``` + +The `docker compose publish` command supports non-interactive execution, letting you skip the confirmation prompt by including the `-y` (or `--yes`) flag: + +```console +$ docker compose publish -y username/my-compose-app:latest +```