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 d1a1c2a46272..391bf1a97054 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md @@ -12,6 +12,7 @@ Define and run multi-container applications with Docker | Name | Description | |:--------------------------------|:----------------------------------------------------------------------------------------| | [`attach`](compose_attach.md) | Attach local standard input, output, and error streams to a service's running container | +| [`bridge`](compose_bridge.md) | Convert compose files into another model | | [`build`](compose_build.md) | Build or rebuild services | | [`commit`](compose_commit.md) | Create a new image from a service container's changes | | [`config`](compose_config.md) | Parse, resolve and render compose file in canonical format | @@ -58,7 +59,7 @@ Define and run multi-container applications with Docker | `-f`, `--file` | `stringArray` | | Compose configuration files | | `--parallel` | `int` | `-1` | Control max parallelism, -1 for unlimited | | `--profile` | `stringArray` | | Specify a profile to enable | -| `--progress` | `string` | `auto` | Set type of progress output (auto, tty, plain, json, quiet) | +| `--progress` | `string` | | Set type of progress output (auto, tty, plain, json, quiet) | | `--project-directory` | `string` | | Specify an alternate working directory
(default: the path of the, first specified, Compose file) | | `-p`, `--project-name` | `string` | | Project name | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge.md new file mode 100644 index 000000000000..78d3da4934c5 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge.md @@ -0,0 +1,22 @@ +# docker compose bridge + + +Convert compose files into another model + +### Subcommands + +| Name | Description | +|:-------------------------------------------------------|:-----------------------------------------------------------------------------| +| [`convert`](compose_bridge_convert.md) | Convert compose files to Kubernetes manifests, Helm charts, or another model | +| [`transformations`](compose_bridge_transformations.md) | Manage transformation images | + + +### Options + +| Name | Type | Default | Description | +|:------------|:-------|:--------|:--------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_convert.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_convert.md new file mode 100644 index 000000000000..d4b91ba172d2 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_convert.md @@ -0,0 +1,17 @@ +# docker compose bridge convert + + +Convert compose files to Kubernetes manifests, Helm charts, or another model + +### Options + +| Name | Type | Default | Description | +|:-------------------------|:--------------|:--------|:-------------------------------------------------------------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `-o`, `--output` | `string` | `out` | The output directory for the Kubernetes resources | +| `--templates` | `string` | | Directory containing transformation templates | +| `-t`, `--transformation` | `stringArray` | | Transformation to apply to compose model (default: docker/compose-bridge-kubernetes) | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations.md new file mode 100644 index 000000000000..1e1c7be392b1 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations.md @@ -0,0 +1,22 @@ +# docker compose bridge transformations + + +Manage transformation images + +### Subcommands + +| Name | Description | +|:-----------------------------------------------------|:-------------------------------| +| [`create`](compose_bridge_transformations_create.md) | Create a new transformation | +| [`list`](compose_bridge_transformations_list.md) | List available transformations | + + +### Options + +| Name | Type | Default | Description | +|:------------|:-------|:--------|:--------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_create.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_create.md new file mode 100644 index 000000000000..187e8d9eca30 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_create.md @@ -0,0 +1,15 @@ +# docker compose bridge transformations create + + +Create a new transformation + +### Options + +| Name | Type | Default | Description | +|:---------------|:---------|:--------|:----------------------------------------------------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `-f`, `--from` | `string` | | Existing transformation to copy (default: docker/compose-bridge-kubernetes) | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_list.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_list.md new file mode 100644 index 000000000000..ce0a5e6911ad --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_bridge_transformations_list.md @@ -0,0 +1,20 @@ +# docker compose bridge transformations list + + +List available transformations + +### Aliases + +`docker compose bridge transformations list`, `docker compose bridge transformations ls` + +### Options + +| Name | Type | Default | Description | +|:----------------|:---------|:--------|:-------------------------------------------| +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `--format` | `string` | `table` | Format the output. Values: [table \| json] | +| `-q`, `--quiet` | `bool` | | Only display transformer names | + + + + 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 58ec47802a55..93332702cda1 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 @@ -6,6 +6,7 @@ pname: docker plink: docker.yaml cname: - docker compose attach + - docker compose bridge - docker compose build - docker compose commit - docker compose config @@ -40,6 +41,7 @@ cname: - docker compose watch clink: - docker_compose_attach.yaml + - docker_compose_bridge.yaml - docker_compose_build.yaml - docker_compose_commit.yaml - docker_compose_config.yaml @@ -167,7 +169,6 @@ options: swarm: false - option: progress value_type: string - default_value: auto description: Set type of progress output (auto, tty, plain, json, quiet) deprecated: false hidden: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_generate.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_generate.yaml index 0932af080ecc..f31429c2d725 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_generate.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_generate.yaml @@ -45,7 +45,7 @@ inherited_options: kubernetes: false swarm: false deprecated: false -hidden: false +hidden: true experimental: false experimentalcli: true kubernetes: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml index 1566677472ae..2c92249395c6 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_publish.yaml @@ -58,7 +58,7 @@ inherited_options: kubernetes: false swarm: false deprecated: false -hidden: false +hidden: true experimental: false experimentalcli: true kubernetes: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_viz.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_viz.yaml index b179d648ef83..c07475caac8a 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_viz.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_alpha_viz.yaml @@ -69,7 +69,7 @@ inherited_options: kubernetes: false swarm: false deprecated: false -hidden: false +hidden: true experimental: false experimentalcli: true kubernetes: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge.yaml new file mode 100644 index 000000000000..5ef9ebf55850 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge.yaml @@ -0,0 +1,29 @@ +command: docker compose bridge +short: Convert compose files into another model +long: Convert compose files into another model +pname: docker compose +plink: docker_compose.yaml +cname: + - docker compose bridge convert + - docker compose bridge transformations +clink: + - docker_compose_bridge_convert.yaml + - docker_compose_bridge_transformations.yaml +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_convert.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_convert.yaml new file mode 100644 index 000000000000..f55f0b233c3c --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_convert.yaml @@ -0,0 +1,59 @@ +command: docker compose bridge convert +short: | + Convert compose files to Kubernetes manifests, Helm charts, or another model +long: | + Convert compose files to Kubernetes manifests, Helm charts, or another model +usage: docker compose bridge convert +pname: docker compose bridge +plink: docker_compose_bridge.yaml +options: + - option: output + shorthand: o + value_type: string + default_value: out + description: The output directory for the Kubernetes resources + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: templates + value_type: string + description: Directory containing transformation templates + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: transformation + shorthand: t + value_type: stringArray + default_value: '[]' + description: | + Transformation to apply to compose model (default: docker/compose-bridge-kubernetes) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations.yaml new file mode 100644 index 000000000000..2ab5661f0b2a --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations.yaml @@ -0,0 +1,29 @@ +command: docker compose bridge transformations +short: Manage transformation images +long: Manage transformation images +pname: docker compose bridge +plink: docker_compose_bridge.yaml +cname: + - docker compose bridge transformations create + - docker compose bridge transformations list +clink: + - docker_compose_bridge_transformations_create.yaml + - docker_compose_bridge_transformations_list.yaml +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_create.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_create.yaml new file mode 100644 index 000000000000..e8dd9e58a51e --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_create.yaml @@ -0,0 +1,36 @@ +command: docker compose bridge transformations create +short: Create a new transformation +long: Create a new transformation +usage: docker compose bridge transformations create [OPTION] PATH +pname: docker compose bridge transformations +plink: docker_compose_bridge_transformations.yaml +options: + - option: from + shorthand: f + value_type: string + description: | + Existing transformation to copy (default: docker/compose-bridge-kubernetes) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_list.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_list.yaml new file mode 100644 index 000000000000..3afd3a84b8e7 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_bridge_transformations_list.yaml @@ -0,0 +1,47 @@ +command: docker compose bridge transformations list +aliases: docker compose bridge transformations list, docker compose bridge transformations ls +short: List available transformations +long: List available transformations +usage: docker compose bridge transformations list +pname: docker compose bridge transformations +plink: docker_compose_bridge_transformations.yaml +options: + - option: format + value_type: string + default_value: table + description: 'Format the output. Values: [table | json]' + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: quiet + shorthand: q + value_type: bool + default_value: "false" + description: Only display transformer names + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: dry-run + value_type: bool + default_value: "false" + description: Execute command in dry run mode + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + 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 1197d5314c47..6d1446a51012 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 @@ -118,7 +118,6 @@ options: swarm: false - option: progress value_type: string - default_value: auto description: Set type of ui output (auto, tty, plain, json, quiet) deprecated: false hidden: true diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 0f8378891759..54a9c731b807 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/moby/moby v28.2.1+incompatible # github.com/moby/buildkit v0.22.0 # github.com/docker/buildx v0.24.0 -# github.com/docker/cli v28.2.1+incompatible -# github.com/docker/compose/v2 v2.36.2 +# github.com/docker/cli v28.2.2+incompatible +# github.com/docker/compose/v2 v2.37.0 # github.com/docker/model-cli v0.1.26-0.20250527144806-15d0078a3c01 # 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 8c0bcc198fb9..0b76ab64f95e 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,9 +13,9 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). -## 2.36.2 +## 2.37.0 -{{< release-date date="2025-05-23" >}} +{{< release-date date="2025-06-05" >}} ### Bug fixes and enhancements @@ -29,6 +29,22 @@ For more detailed information, see the [release notes in the Compose repo](https - Dependencies upgrade: bump buildx to v0.24.0 - Dependencies upgrade: bump buildkit to v0.22.0 +## 2.36.2 + +{{< release-date date="2025-05-23" >}} + +### Bug fixes and enhancements + +- Compose Bridge features are now part of Compose +- Improved display of the `docker compose images` command +- Promoted `bake` as the default build tool for Compose +- Fixed issues around build flow +- Fixed the restart of dependent services after `watch` rebuild images + +### Update + +- Dependencies upgrade: bump docker engine and cli to v28.2.2 + ## 2.36.1 {{< release-date date="2025-05-19" >}} diff --git a/go.mod b/go.mod index ed26e0edda3e..3bbf64cb4b61 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.24.0 require ( github.com/docker/buildx v0.24.0 // indirect - github.com/docker/cli v28.2.1+incompatible // indirect - github.com/docker/compose/v2 v2.36.2 // indirect + github.com/docker/cli v28.2.2+incompatible // indirect + github.com/docker/compose/v2 v2.37.0 // indirect github.com/docker/model-cli v0.1.26-0.20250527144806-15d0078a3c01 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.22.0 // indirect @@ -15,7 +15,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.24.0 github.com/docker/cli => github.com/docker/cli v28.2.1+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.36.2 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.37.0 github.com/docker/model-cli => github.com/docker/model-cli v0.1.26-0.20250527144806-15d0078a3c01 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.22.0 diff --git a/go.sum b/go.sum index c5ff0571855a..28a2990c6f6c 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ github.com/docker/cli v28.2.1+incompatible h1:AYyTcuwvhl9dXdyCiXlOGXiIqSNYzTmaDN github.com/docker/cli v28.2.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose/v2 v2.36.2 h1:rxk1PUUbhbAS6HkGsYo9xUmMBpKtVwFMNCQjE4+i5fk= github.com/docker/compose/v2 v2.36.2/go.mod h1:mZygkne+MAMu/e1B28PBFmG0Z0WefbxZ/IpcjSFdrw8= +github.com/docker/compose/v2 v2.37.0 h1:R8Yik9ssiRz7T9BRfdOZy0xHDzOFPIJX40DrxzJ62dQ= +github.com/docker/compose/v2 v2.37.0/go.mod h1:twDoqUBFO2L5+vccJjkR6shQOH8C50V8AAQPxlkFr2Q= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw= diff --git a/hugo.yaml b/hugo.yaml index f941ce9390a0..4ec0286daf37 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.2" + compose_version: "v2.37.0" # Latest BuildKit version buildkit_version: "0.22.0"