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 78c1835a5278..3ec2d4864afd 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 @@ -5,10 +5,6 @@ It merges the Compose files set by `-f` flags, resolves variables in the Compose file, and expands short-notation into the canonical format. -### Aliases - -`docker compose config`, `docker compose convert` - ### Options | Name | Type | Default | Description | @@ -18,6 +14,7 @@ the canonical format. | `--format` | `string` | | Format the output. Values: [yaml \| json] | | `--hash` | `string` | | Print the service config hash, one per line. | | `--images` | `bool` | | Print the image names, one per line. | +| `--lock-image-digests` | `bool` | | Produces an override file with image digests | | `--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 | 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 7ec479b2000b..080fe6748e6b 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 @@ -1,5 +1,4 @@ command: docker compose config -aliases: docker compose config, docker compose convert short: Parse, resolve and render compose file in canonical format long: |- `docker compose config` renders the actual data model to be applied on the Docker Engine. @@ -47,6 +46,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: lock-image-digests + value_type: bool + default_value: "false" + description: Produces an override file with image digests + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: no-consistency value_type: bool default_value: "false" diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 5b934fd1d8dc..587dc8a1a582 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.22.0-rc1 # github.com/docker/buildx v0.23.0 # github.com/docker/cli v28.1.1+incompatible -# github.com/docker/compose/v2 v2.36.0 +# github.com/docker/compose/v2 v2.36.1 # 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 a37c97ff2048..0ebbd27b47c2 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,23 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.36.1 + +{{< release-date date="2025-05-19" >}} + +### Bug fixes and enhancements + +- Introduced support of arrays for `provider` service `options` attribute +- Added `debug` messages in the extension protocol +- Fixed an issue when trying to publish a Compose application with a `provider` service +- Fixed build issues on Compose applications with `service.provider` +- Introduced `--lock-image-digests` to `config` command + +### Update + +- Dependencies upgrade: bump compose-go to v2.6.3 +- Dependencies upgrade: bump containerd to 2.1.0 + ## 2.36.0 {{< release-date date="2025-05-07" >}} diff --git a/go.mod b/go.mod index 30b94a7aabe5..cf822a02d1ef 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require ( github.com/docker/buildx v0.23.0 // indirect github.com/docker/cli v28.1.1+incompatible // indirect - github.com/docker/compose/v2 v2.36.0 // indirect + github.com/docker/compose/v2 v2.36.1 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.22.0-rc1 // indirect github.com/moby/moby v28.1.0-rc.2+incompatible // indirect @@ -14,7 +14,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.24.0-rc1 github.com/docker/cli => github.com/docker/cli v28.1.0-rc.2+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.36.0 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.36.1 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.22.0-rc1 github.com/moby/moby => github.com/moby/moby v28.1.0-rc.2+incompatible diff --git a/go.sum b/go.sum index 21006819ab14..9ac0681b003a 100644 --- a/go.sum +++ b/go.sum @@ -234,6 +234,8 @@ github.com/docker/compose/v2 v2.35.1 h1:oRt5EE22een6DEAkNNQcuzJGhBS2rcMtEKdbfMhF github.com/docker/compose/v2 v2.35.1/go.mod h1:Ydd9ceg7VBOPSVAsDDKfyGGAkjejH3cD91GSmHjuRhI= github.com/docker/compose/v2 v2.36.0 h1:MACSfQ2xqcwgCwAtsHVoQkFbHi2nNfNAsd5EWFg164k= github.com/docker/compose/v2 v2.36.0/go.mod h1:kFPppTinl2Q0Lv3Dy9titIL41oWYoUkNxoKQZb/lfSU= +github.com/docker/compose/v2 v2.36.1 h1:BmTE1Ps6XDOuubyL97ucPvIn8Nq2XprRylE2dgCtTXw= +github.com/docker/compose/v2 v2.36.1/go.mod h1:w6fj+dvMW9W0gFaTpIwJ2PYstqiGIC07Cajp5wPukO0= 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 86f4f43246ee..da91269bc731 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -140,7 +140,7 @@ params: # (Used to show e.g., "latest" and "latest"-1 in engine install examples docker_ce_version_prev: "28.1.0" # Latest Docker Compose version - compose_version: "v2.36.0" + compose_version: "v2.36.1" # Latest BuildKit version buildkit_version: "0.21.0"