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 5a69a01b508..d625c253e67 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md @@ -13,6 +13,7 @@ Define and run multi-container applications with Docker |:--------------------------------|:----------------------------------------------------------------------------------------| | [`attach`](compose_attach.md) | Attach local standard input, output, and error streams to a service's running container | | [`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 | | [`cp`](compose_cp.md) | Copy files/folders between a service container and the local filesystem | | [`create`](compose_create.md) | Creates containers for a service | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_commit.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_commit.md new file mode 100644 index 00000000000..1aad40931f9 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_commit.md @@ -0,0 +1,19 @@ +# docker compose commit + + +Create a new image from a service container's changes + +### Options + +| Name | Type | Default | Description | +|:------------------|:---------|:--------|:-----------------------------------------------------------| +| `-a`, `--author` | `string` | | Author (e.g., "John Hannibal Smith ") | +| `-c`, `--change` | `list` | | Apply Dockerfile instruction to the created image | +| `--dry-run` | `bool` | | Execute command in dry run mode | +| `--index` | `int` | `0` | index of the container if service has multiple replicas. | +| `-m`, `--message` | `string` | | Commit message | +| `-p`, `--pause` | `bool` | `true` | Pause container during commit | + + + + diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md index 295000734b1..410ec84b52d 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_up.md @@ -51,7 +51,7 @@ If the process is interrupted using `SIGINT` (ctrl + C) or `SIGTERM`, the contai | `-t`, `--timeout` | `int` | `0` | Use this timeout in seconds for container shutdown when attached or when containers are already running | | `--timestamps` | `bool` | | Show timestamps | | `--wait` | `bool` | | Wait for services to be running\|healthy. Implies detached mode. | -| `--wait-timeout` | `int` | `0` | Maximum duration to wait for the project to be running\|healthy | +| `--wait-timeout` | `int` | `0` | Maximum duration in seconds to wait for the project to be running\|healthy | | `-w`, `--watch` | `bool` | | Watch source code and rebuild/refresh containers when files are updated. | 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 f59ec4a04b2..1c6fb4970e7 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 @@ -7,6 +7,7 @@ plink: docker.yaml cname: - docker compose attach - docker compose build + - docker compose commit - docker compose config - docker compose cp - docker compose create @@ -39,6 +40,7 @@ cname: clink: - docker_compose_attach.yaml - docker_compose_build.yaml + - docker_compose_commit.yaml - docker_compose_config.yaml - docker_compose_cp.yaml - docker_compose_create.yaml diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_commit.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_commit.yaml new file mode 100644 index 00000000000..95f4834a97b --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_commit.yaml @@ -0,0 +1,76 @@ +command: docker compose commit +short: Create a new image from a service container's changes +long: Create a new image from a service container's changes +usage: docker compose commit [OPTIONS] SERVICE [REPOSITORY[:TAG]] +pname: docker compose +plink: docker_compose.yaml +options: + - option: author + shorthand: a + value_type: string + description: Author (e.g., "John Hannibal Smith ") + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: change + shorthand: c + value_type: list + description: Apply Dockerfile instruction to the created image + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: index + value_type: int + default_value: "0" + description: index of the container if service has multiple replicas. + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: message + shorthand: m + value_type: string + description: Commit message + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: pause + shorthand: p + value_type: bool + default_value: "true" + description: Pause container during commit + 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_up.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml index 4c895f6a65b..1474cfe2ee6 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_up.yaml @@ -289,7 +289,8 @@ options: - option: wait-timeout value_type: int default_value: "0" - description: Maximum duration to wait for the project to be running|healthy + description: | + Maximum duration in seconds to wait for the project to be running|healthy deprecated: false hidden: false experimental: false diff --git a/_vendor/modules.txt b/_vendor/modules.txt index aaf838f5fdd..e08dfe562a2 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -2,5 +2,5 @@ # github.com/moby/buildkit v0.18.0 # github.com/docker/buildx v0.19.1 # github.com/docker/cli v27.4.0-rc.2+incompatible -# github.com/docker/compose/v2 v2.30.3 +# github.com/docker/compose/v2 v2.31.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 43524bc4fd6..ff14e92aca6 100644 --- a/content/manuals/compose/releases/release-notes.md +++ b/content/manuals/compose/releases/release-notes.md @@ -13,6 +13,25 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.31.0 + +{{< release-date date="2024-11-28" >}} + +### Update + +- Dependencies upgrade: bump compose-go to v2.4.5 +- Dependencies upgrade: bump docker engine and cli to v27.4.0-rc.2 +- Dependencies upgrade: bump buildx to v0.18.0 +- Dependencies upgrade: bump buildkit to v0.17.1 + +### Bug fixes and enhancements + +- Added the ability to use Docker Buildx Bake to build Docker Compose services +- Added `commit` command to create new images from running containers +- Fixed an issue where network changes were not detected +- Fixed an issue where containers stopped sequentially which slowed down the restart process + + ## 2.30.3 {{< release-date date="2024-11-07" >}} diff --git a/go.mod b/go.mod index 491345ccc8e..a31fba6d9ac 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.19.1 // indirect github.com/docker/cli v27.4.0-rc.2+incompatible // indirect - github.com/docker/compose/v2 v2.30.3 // indirect + github.com/docker/compose/v2 v2.31.0 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.18.0 // indirect github.com/moby/moby v27.3.1+incompatible // indirect @@ -14,7 +14,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.19.1 github.com/docker/cli => github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.3 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.31.0 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.18.0 github.com/moby/moby => github.com/moby/moby v27.3.1+incompatible diff --git a/go.sum b/go.sum index 9fcba6476bf..414887bca94 100644 --- a/go.sum +++ b/go.sum @@ -184,6 +184,8 @@ github.com/docker/compose/v2 v2.30.2 h1:7PypFsyl5wjlSeOyx3LCb8XMcAGkb+D0fqM47OIK github.com/docker/compose/v2 v2.30.2/go.mod h1:ND4+yaNoJ3Jh1OgrEO64uzMq/VKRqBkMS8zpb65Fve8= github.com/docker/compose/v2 v2.30.3 h1:e8H7xGLCZOeFo46GEtyDGHlkBbNgXqbXKIXPOSL8cfU= github.com/docker/compose/v2 v2.30.3/go.mod h1:ayPsSsRSc5WpVFehPrTDFuljAydxaf8g0aM9UKbaMXk= +github.com/docker/compose/v2 v2.31.0 h1:8Sm0c4MjIhksguxIA5koYMXoTJDAp/CaZ1cdZrMvMdw= +github.com/docker/compose/v2 v2.31.0/go.mod h1:oQq3UDEdsnB3AUO72AxaoeLbkCgmUu1+8tLzvmphmXA= 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=