From 6057a7b51f5aebef7fccad80b98cc65234a2dd9f Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Thu, 10 Apr 2025 10:30:57 +0200 Subject: [PATCH 1/5] fix use of x-* attribute in go templates (#22403) ## Description fix https://docs.docker.com/compose/bridge/customize/#add-your-own-templates as attributes with a `-` can't be accessed directly using dot-notation in a go template. See https://stackoverflow.com/questions/48146448/range-through-values-within-variable-containing-dashes-in-golang-templates ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review Signed-off-by: Nicolas De Loof --- content/manuals/compose/bridge/customize.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/compose/bridge/customize.md b/content/manuals/compose/bridge/customize.md index 62bdcb880ddb..d978ecf6b9fa 100644 --- a/content/manuals/compose/bridge/customize.md +++ b/content/manuals/compose/bridge/customize.md @@ -133,8 +133,8 @@ metadata: spec: rules: {{ range $name, $service := .services }} -{{ if $service.x-virtual-host }} - - host: ${{ $service.x-virtual-host }} +{{ range index $service "x-virtual-host" }} + - host: ${{ . }} http: paths: - path: "/" From 09fabd2fa0f57277130f13146541598529501962 Mon Sep 17 00:00:00 2001 From: Lorenz Vanthillo Date: Thu, 10 Apr 2025 10:55:47 +0200 Subject: [PATCH 2/5] BuildKit supports multiple cache exporters Related to https://github.com/docker/docs/issues/18590 --- content/manuals/build/cache/backends/_index.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/content/manuals/build/cache/backends/_index.md b/content/manuals/build/cache/backends/_index.md index 6dd4a8a9dee9..de54ea0f6cec 100644 --- a/content/manuals/build/cache/backends/_index.md +++ b/content/manuals/build/cache/backends/_index.md @@ -81,12 +81,11 @@ $ docker buildx build --push -t / \ ## Multiple caches -BuildKit currently only supports -[a single cache exporter](https://github.com/moby/buildkit/pull/3024). But you -can import from as many remote caches as you like. For example, a common pattern -is to use the cache of both the current branch and the main branch. The -following example shows importing cache from multiple locations using the -registry cache backend: +BuildKit supports multiple cache exporters, allowing you to push cache to more +than one destination. You can also import from as many remote caches as you'd +like. For example, a common pattern is to use the cache of both the current +branch and the main branch. The following example shows importing cache from +multiple locations using the registry cache backend: ```console $ docker buildx build --push -t / \ From 258e17544bc1ff8c5cab4fd872bf3f88214be80c Mon Sep 17 00:00:00 2001 From: Lorena Rangel Date: Thu, 10 Apr 2025 11:22:56 +0200 Subject: [PATCH 3/5] Update update release notes (#22407) ## Description Updates the line about the removal of `com.docker.admin`, as it is still present (and used) on Windows. ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 144b0ecc6f34..275183a50ed0 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -57,7 +57,7 @@ For more frequently asked questions, see the [FAQs](/manuals/desktop/troubleshoo - Fixed a race condition that prevented Docker Desktop Kubernetes from starting in some scenarios. - Improved the way ECI collects image digest info from a repository in environments where proxies are configured. - Users can now to specify a timeout when generating a private Extension Marketplace using the new `--timeout` flag. -- Removed unused internal helper tool `com.docker.admin`. +- Removed unused internal helper tool `com.docker.admin` for Mac and Linux. #### For Mac From 72953fc0e326645e1872bfe9bad12f7e2a411dba Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Thu, 10 Apr 2025 16:44:47 +0200 Subject: [PATCH 4/5] Remove obsolete a/b testing service (#22409) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description We’re removing this unused service. ## Related issues or tickets https://docker.atlassian.net/browse/DKP-2125 ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/setup/allow-list.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/manuals/desktop/setup/allow-list.md b/content/manuals/desktop/setup/allow-list.md index 92dc1d882002..3858c242f36e 100644 --- a/content/manuals/desktop/setup/allow-list.md +++ b/content/manuals/desktop/setup/allow-list.md @@ -19,7 +19,6 @@ This page contains the domain URLs that you need to add to a firewall allowlist | ------------------------------------------------------------------------------------ | -------------------------------------------- | | https://api.segment.io | Analytics | | https://cdn.segment.com | Analytics | -| https://experiments.docker.com | A/B testing | | https://notify.bugsnag.com | Error reports | | https://sessions.bugsnag.com | Error reports | | https://auth.docker.io | Authentication | From 7e76be01b2fad63f233a06248a06d60d147c7224 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:35:11 +0200 Subject: [PATCH 5/5] release-notes for Compose v2.35.0 version (#22411) ## Description Add release notes for latest Docker Compose `v2.35.0` version ## Related issues or tickets https://docker.atlassian.net/browse/APCLI-1094 ## Reviews - [ ] Technical review - [x] Editorial review - [ ] Product review --------- Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- .../compose/v2/docs/reference/compose.md | 8 +- .../v2/docs/reference/compose_build.md | 1 + .../v2/docs/reference/compose_config.md | 1 + .../compose/v2/docs/reference/compose_run.md | 2 + .../v2/docs/reference/compose_watch.md | 2 +- .../v2/docs/reference/docker_compose.yaml | 6 +- .../docs/reference/docker_compose_build.yaml | 10 +++ .../docs/reference/docker_compose_config.yaml | 10 +++ .../v2/docs/reference/docker_compose_run.yaml | 21 +++++ .../docs/reference/docker_compose_watch.yaml | 2 +- _vendor/modules.txt | 4 +- .../manuals/compose/releases/release-notes.md | 80 ++++++++++++------- go.mod | 10 ++- go.sum | 2 + hugo.yaml | 2 +- 15 files changed, 116 insertions(+), 45 deletions(-) diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md index cf858c1767ed..d1a1c2a46272 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/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. diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md index 53150cdd8688..98d573e44c38 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_build.md @@ -20,6 +20,7 @@ run `docker compose build` to rebuild it. | `--dry-run` | `bool` | | Execute command in dry run mode | | `-m`, `--memory` | `bytes` | `0` | Set memory limit for the build container. Not supported by BuildKit. | | `--no-cache` | `bool` | | Do not use cache when building the image | +| `--print` | `bool` | | Print equivalent bake file | | `--pull` | `bool` | | Always attempt to pull a newer version of the image | | `--push` | `bool` | | Push service images | | `-q`, `--quiet` | `bool` | | Don't print anything to STDOUT | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md index 0eac3de63718..9e87efd29cbc 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_config.md @@ -19,6 +19,7 @@ the canonical format. | `--hash` | `string` | | Print the service config hash, one per line. | | `--images` | `bool` | | Print the image names, one per line. | | `--no-consistency` | `bool` | | Don't check model consistency - warning: may produce invalid Compose output | +| `--no-env-resolution` | `bool` | | Don't resolve service env files | | `--no-interpolate` | `bool` | | Don't interpolate environment variables | | `--no-normalize` | `bool` | | Don't normalize compose model | | `--no-path-resolution` | `bool` | | Don't resolve file paths | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md index e4be01d2db1c..25b28d1ded85 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_run.md @@ -74,6 +74,8 @@ specified in the service configuration. | `--no-deps` | `bool` | | Don't start linked services | | `-p`, `--publish` | `stringArray` | | Publish a container's port(s) to the host | | `--pull` | `string` | `policy` | Pull image before running ("always"\|"missing"\|"never") | +| `-q`, `--quiet` | `bool` | | Don't print anything to STDOUT | +| `--quiet-build` | `bool` | | Suppress progress output from the build process | | `--quiet-pull` | `bool` | | Pull without printing progress information | | `--remove-orphans` | `bool` | | Remove containers for services not defined in the Compose file | | `--rm` | `bool` | | Automatically remove the container when it exits | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_watch.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_watch.md index e2b4aef1a203..f6040c9094f2 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_watch.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_watch.md @@ -9,7 +9,7 @@ Watch build context for service and rebuild/refresh containers when files are up |:------------|:-------|:--------|:----------------------------------------------| | `--dry-run` | `bool` | | Execute command in dry run mode | | `--no-up` | `bool` | | Do not build & start services before watching | -| `--prune` | `bool` | | Prune dangling images on rebuild | +| `--prune` | `bool` | `true` | Prune dangling images on rebuild | | `--quiet` | `bool` | | hide build output | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml index a31cb41082eb..58ec47802a55 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose.yaml +++ b/_vendor/github.com/docker/compose/v2/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 diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml index 92285de2efb3..3f53dcf73628 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_build.yaml @@ -96,6 +96,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: print + value_type: bool + default_value: "false" + description: Print equivalent bake file + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: progress value_type: string default_value: auto diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml index 8073d85ab6e0..15b1e7dc3989 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_config.yaml @@ -59,6 +59,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: no-env-resolution + value_type: bool + default_value: "false" + description: Don't resolve service env files + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: no-interpolate value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml index 6e6ec71f8d0a..61c7ca0e8cbc 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_run.yaml @@ -200,6 +200,27 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: quiet + shorthand: q + value_type: bool + default_value: "false" + description: Don't print anything to STDOUT + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: quiet-build + value_type: bool + default_value: "false" + description: Suppress progress output from the build process + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: quiet-pull value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_watch.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_watch.yaml index 454bf36342ad..a3e3e8022011 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_watch.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_watch.yaml @@ -19,7 +19,7 @@ options: swarm: false - option: prune value_type: bool - default_value: "false" + default_value: "true" description: Prune dangling images on rebuild deprecated: false hidden: false diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 05e4f687fd63..add37c275805 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v28.0.2+incompatible # github.com/moby/buildkit v0.20.1 # github.com/docker/buildx v0.22.0 -# github.com/docker/cli v28.0.2+incompatible -# github.com/docker/compose/v2 v2.34.0 +# github.com/docker/cli v28.0.4+incompatible +# github.com/docker/compose/v2 v2.35.0 # github.com/docker/scout-cli v1.15.0 diff --git a/content/manuals/compose/releases/release-notes.md b/content/manuals/compose/releases/release-notes.md index 9d67e1e17427..3b59ca3b7474 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,28 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.35.0 + +{{< release-date date="2025-04-10" >}} + +### Bug fixes and enhancements + +- Added support for Docker Model Runner to easily integrate AI models into your Compose applications +- Added `build --print` command to help debug complex build configurations by showing the equivalent bake file +- Added `volume.type=image` to provide more flexible volume management for container images +- Added `--quiet` options to the `run` command for cleaner output when running containers +- Added `config --no-env-resolution` option to view raw configuration without environment variable substitution +- Fixed behavior of `depends_on` to prevent unnecessary container recreation when dependencies change +- Fixed support for secrets defined by environment variables when using `include` +- Fixed volume mount handling to ensure bind mounts work correctly in all scenarios + +### Update + +- Dependencies upgrade: bump compose-go to v2.6.0 +- Dependencies upgrade: bump docker engine and cli to v28.0.4 +- Dependencies upgrade: bump buildx to v0.22.0 + + ## 2.34.0 {{< release-date date="2025-03-14" >}} @@ -32,13 +54,13 @@ For more detailed information, see the [release notes in the Compose repo](https - Dependencies upgrade: Bump compose-go v2.4.9 - Dependencies upgrade: Bump buildx v0.21.2 -## 2.33.1 +## 2.33.1 {{< release-date date="2025-02-21" >}} ### Bug fixes and enhancements -- Added support for `gw_priority`, `enable_ipv4` (requires Docker v28.0) +- Added support for `gw_priority`, `enable_ipv4` (requires Docker v28.0) - Fixed an issue with the navigation menu - Improved error message when using non-file secret/config with read-only service @@ -198,7 +220,7 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Fixed an issue re-creating services when updating its profiles +- Fixed an issue re-creating services when updating its profiles - Fixed a regression when using the same YAML anchor multiple times in a Compose file ## 2.30.1 @@ -271,7 +293,7 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Fixed an issue with services not stopping when restarting diverged dependencies. +- Fixed an issue with services not stopping when restarting diverged dependencies. - Fixed potential `nil` pointer error on the OTEL client. ## 2.29.3 @@ -285,7 +307,7 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Combination of bind mount and `rebuild` are now allowed with `watch`. +- Combination of bind mount and `rebuild` are now allowed with `watch`. - Fixed a bug recreating containers when `--no-deps` is used with `up`. - Fixed a bug not closing streams when reattaching containers. - Restored recreation of anonymous volumes when using `-V` or `--renew-anon-volumes`. @@ -484,8 +506,8 @@ For more detailed information, see the [release notes in the Compose repo](https ### Bug fixes and enhancements -- Compose now ensures stable priority sort order for networks -- Fixed interpolation with curly braces (e.g. JSON) in default values +- Compose now ensures stable priority sort order for networks +- Fixed interpolation with curly braces (e.g. JSON) in default values - Fixed validation for non-unique `container_name` values - Fixed validation for `develop.watch` - Fixed environment loading for `include` @@ -580,15 +602,15 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C - Dependencies upgrade: bump cli to 25.0.0-beta.3 - Dependencies upgrade: bump compose-go to 2.0.0-beta.3 -- Dependencies upgrade: bump golang to 1.21.6 +- Dependencies upgrade: bump golang to 1.21.6 ### Bug fixes and enhancements - Introduced `docker compose attach` to attach local standard input, output, and error streams to a service's running container. - Introduced `docker compose stats` to display a live stream of container(s) resource usage statistics. - Introduced `docker compose ps --orphans` to include/exclude services not declared. -- Introduced `docker compose logs --index` to select a replica container. -- Introduced `docker compose build --with-dependencies` to also build dependencies. +- Introduced `docker compose logs --index` to select a replica container. +- Introduced `docker compose build --with-dependencies` to also build dependencies. - Added source policies for build. - Included disabled services for shell completion. - Restored `Project` in ps JSON output. @@ -615,9 +637,9 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C ### Update -- Dependencies upgrade: bump buildkit 0.12.3 -- Dependencies upgrade: bump docker 24.0.7 -- Dependencies upgrade: bump cli 24.0.7 +- Dependencies upgrade: bump buildkit 0.12.3 +- Dependencies upgrade: bump docker 24.0.7 +- Dependencies upgrade: bump cli 24.0.7 - Dependencies upgrade: bump 1.20.2 ### Bug fixes and enhancements @@ -641,7 +663,7 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C - Introduced `--resolve-image-digests` so users can seal service images by digest when publishing a Compose application. - Improved Compose Watch configuration logging. - Compose now rejects a Compose file using `secrets|configs.driver` or `template_driver`. -- Compose now fails to start if a dependency is missing. +- Compose now fails to start if a dependency is missing. - Fixed SIGTERM support to stop/kill stack. - Fixed a `--hash` regression. - Fixed "Application failed to start after update" when an external network is on a watched service. @@ -775,7 +797,7 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C * Fixed a DryRun mode issue when initializing CLI client. * Fixed a bug with random missing network when a service has more than one. * Fixed the Secrets file permission value to comply with the Compose Specification. -* Fixed an issue about `no-deps` flag not being applied. +* Fixed an issue about `no-deps` flag not being applied. * Fixed some source code comments. * Fixed a bug when `--index` is not set select. * Fixed a process leak in the wait e2e test. @@ -813,7 +835,7 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C - Introduced `run --cap-add` to run maintenance commands using service image. - Fixed a bug during detection of swarm mode. - Fixed a bug when setting the project name via `COMPOSE_PROJECT_NAME` environment variable. -- Adjusted the display of the volumes flag with the help of `down` command. +- Adjusted the display of the volumes flag with the help of `down` command. - Fixed a bug in the `up` command which should not silently ignore missing `depends_on` services. - Aligned forward signal to container behaviour with the `docker run` one. - Compose now detects network name conflict. @@ -1072,10 +1094,10 @@ This release fixes a build issue with Docker Desktop for Windows introduced in C - Fixed race condition when collecting pulled images IDs. Fixed [compose#9897](https://github.com/docker/compose/pull/9897) - Compose doesn't stop the `pull` command for images that can be built. Fixed [compose#8724](https://github.com/docker/compose/pull/8724) - Fixed corner case when there's no container to attach to. Fixed [compose#8752](https://github.com/docker/compose/pull/8752) -- Compose containers' startup must run sequentially for engine to assign distinct ports within a configured range. Fixed +- Compose containers' startup must run sequentially for engine to assign distinct ports within a configured range. Fixed [compose#8530](https://github.com/docker/compose/pull/8530) - Fixed parsing of `repository:tag`. Fixed [compose#9208](https://github.com/docker/compose/pull/9208) -- Load project from files when explicitly set by user. Fixed [compose#9554](https://github.com/docker/compose/pull/9554) +- Load project from files when explicitly set by user. Fixed [compose#9554](https://github.com/docker/compose/pull/9554) ## 2.14.0 @@ -1343,7 +1365,7 @@ In this release, Docker Compose recreates new resources (networks, volumes, secr ### Bug fixes and enhancements - Fixed interpolation error message output. Fixes [compose-spec/compose-go#292](https://github.com/compose-spec/compose-go/pull/292). -- Defined precedence of the environment variables evaluation. Fixes [compose#9521](https://github.com/docker/compose/issues/9606), +- Defined precedence of the environment variables evaluation. Fixes [compose#9521](https://github.com/docker/compose/issues/9606), [compose#9638](https://github.com/docker/compose/issues/9638), [compose#9608](https://github.com/docker/compose/issues/9608), [compose#9578](https://github.com/docker/compose/issues/9578). @@ -1365,7 +1387,7 @@ For the full change log or additional information, check the [Compose repository ### Updates -- Dependencies upgrade: bumped [go to 1.18.4](https://github.com/golang/go/compare/go1.18.3...go1.18.4). +- Dependencies upgrade: bumped [go to 1.18.4](https://github.com/golang/go/compare/go1.18.3...go1.18.4). - Dependencies upgrade: bumped [compose-go to v1.2.9](https://github.com/compose-spec/compose-go/releases/tag/v1.2.9). ### Bug fixes and enhancements @@ -1448,7 +1470,7 @@ For the full change log or additional information, check the [Compose repository - Dependencies update: bumping [compose-go to 1.2.6](https://github.com/compose-spec/compose-go/releases/tag/v1.2.6). - Dependencies update: bumping [compose-go to 1.2.7](https://github.com/compose-spec/compose-go/releases/tag/v1.2.7). -- Dependencies update: bumping [golang to 1.18](https://go.dev/doc/devel/release#go1.18). +- Dependencies update: bumping [golang to 1.18](https://go.dev/doc/devel/release#go1.18). ### Bug fixes and enhancements @@ -1511,10 +1533,10 @@ For the full change log or additional information, check the [Compose repository - Added ssh config to the build options when building an image from a `docker compose up` command. Fixes [#9338](https://github.com/docker/compose/issues/9338). - Added inspection to container checking if a TTY is required. Running services with `tty:true` specified now show console output. Fixes [#9288](https://github.com/docker/compose/issues/9288). -For the full change log or additional information, check the [Compose repository 2.4.1 release page](https://github.com/docker/compose/releases/tag/v2.4.1). +For the full change log or additional information, check the [Compose repository 2.4.1 release page](https://github.com/docker/compose/releases/tag/v2.4.1). -## 2.4.0 +## 2.4.0 {{< release-date date="2022-04-1" >}} @@ -1536,10 +1558,10 @@ For the full change log or additional information, check the [Compose repository - Removed code regarding an obsolete warning. - Vendor: github.com/containerd/containerd v1.6.2. Includes a fix for CVE-2022-24769 (doesn't affect our codebase). -For the full change log or additional information, check the [Compose repository 2.4.0 release page](https://github.com/docker/compose/releases/tag/v2.4.0). +For the full change log or additional information, check the [Compose repository 2.4.0 release page](https://github.com/docker/compose/releases/tag/v2.4.0). -## 2.3.4 +## 2.3.4 {{< release-date date="2022-03-25" >}} @@ -1551,7 +1573,7 @@ For the full change log or additional information, check the [Compose repository - Removed a container with no candidate now produces a warning instead of an error. Fixes [#9255](https://github.com/docker/compose/issues/9255). - Removed the "Deprecated" mentions from -i and -t options to run and exec commands. These options are on by default and in use. Fixes [#9229](https://github.com/docker/compose/pull/9229#discussion_r819730788). -- Removed the "Deprecated" mention from the --filter flag, to keep consistency with other commands. +- Removed the "Deprecated" mention from the --filter flag, to keep consistency with other commands. - Removed the need to get the original compose.yaml file to run 'docker compose kill'. ### Updates @@ -1567,9 +1589,9 @@ For the full change log or additional information, check the [Compose repository Fixes [#9172](https://github.com/docker/compose/issues/9172), [#9145](https://github.com/docker/compose/issues/9145). - Changed Compose API reference docs automation to pick up diffs code vs. docs. -For the full change log or additional information, check the [Compose repository 2.3.4 release page](https://github.com/docker/compose/releases/tag/v2.3.4). +For the full change log or additional information, check the [Compose repository 2.3.4 release page](https://github.com/docker/compose/releases/tag/v2.3.4). -## Other Releases +## Other Releases (2022-03-8 to 2022-04-14) @@ -1701,7 +1723,7 @@ For a list of PRs and issues fixed in this release, see [Compose 1.28.3](https:/ - CI setup update -## 1.28.0 +## 1.28.0 (2021-01-20) diff --git a/go.mod b/go.mod index b4589b26c998..7bb751dbd1d1 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,13 @@ module github.com/docker/docs -go 1.23.6 +go 1.23.8 + +toolchain go1.24.1 require ( github.com/docker/buildx v0.22.0 // indirect - github.com/docker/cli v28.0.2+incompatible // indirect - github.com/docker/compose/v2 v2.34.0 // indirect + github.com/docker/cli v28.0.4+incompatible // indirect + github.com/docker/compose/v2 v2.35.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.20.1 // indirect github.com/moby/moby v28.0.2+incompatible // indirect @@ -14,7 +16,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.22.0 github.com/docker/cli => github.com/docker/cli v28.0.2+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.34.0 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.35.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.20.0 github.com/moby/moby => github.com/moby/moby v28.0.2+incompatible diff --git a/go.sum b/go.sum index 4963ee67b97b..a5d17463c694 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,8 @@ github.com/docker/compose/v2 v2.33.1 h1:i/V1gUpdbc4tMRfx30aYzw7oHKM8NGB2Oe4AUJUo github.com/docker/compose/v2 v2.33.1/go.mod h1:TdDv/kdWOFrCWum5SVxVGVr+P9znSZepukHF1Dam25U= github.com/docker/compose/v2 v2.34.0 h1:mUhgA6AiRVO9hEndD2G2oOQi5Y0g/4H8xSPVUc5TYdU= github.com/docker/compose/v2 v2.34.0/go.mod h1:TgTD4Ku0vOSB3NZgOXp6HcCE6wDSBjg7r8bjWraV5/4= +github.com/docker/compose/v2 v2.35.0 h1:bU23OeFrbGyHYrKijMSEwkOeDg2TLhAGntU2F3hwX1o= +github.com/docker/compose/v2 v2.35.0/go.mod h1:S5ejUILn9KTYC6noX3IxznWu3/sb3FxdZqIYbq4seAk= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= diff --git a/hugo.yaml b/hugo.yaml index dd4c0c974029..86fb60d1ed75 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -139,7 +139,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "28.0.3" # Latest Docker Compose version - compose_version: "v2.34.0" + compose_version: "v2.35.0" # Latest BuildKit version buildkit_version: "0.20.2"