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 46df7b832ee..3728a76d48e 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose.md @@ -5,36 +5,38 @@ Define and run multi-container applications with Docker. ### Subcommands -| Name | Description | -|:--------------------------------|:--------------------------------------------------------------------------------------| -| [`build`](compose_build.md) | Build or rebuild services | -| [`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. | -| [`down`](compose_down.md) | Stop and remove containers, networks | -| [`events`](compose_events.md) | Receive real time events from containers. | -| [`exec`](compose_exec.md) | Execute a command in a running container. | -| [`images`](compose_images.md) | List images used by the created containers | -| [`kill`](compose_kill.md) | Force stop service containers. | -| [`logs`](compose_logs.md) | View output from containers | -| [`ls`](compose_ls.md) | List running compose projects | -| [`pause`](compose_pause.md) | Pause services | -| [`port`](compose_port.md) | Print the public port for a port binding. | -| [`ps`](compose_ps.md) | List containers | -| [`pull`](compose_pull.md) | Pull service images | -| [`push`](compose_push.md) | Push service images | -| [`restart`](compose_restart.md) | Restart service containers | -| [`rm`](compose_rm.md) | Removes stopped service containers | -| [`run`](compose_run.md) | Run a one-off command on a service. | -| [`scale`](compose_scale.md) | Scale services | -| [`start`](compose_start.md) | Start services | -| [`stop`](compose_stop.md) | Stop services | -| [`top`](compose_top.md) | Display the running processes | -| [`unpause`](compose_unpause.md) | Unpause services | -| [`up`](compose_up.md) | Create and start containers | -| [`version`](compose_version.md) | Show the Docker Compose version information | -| [`wait`](compose_wait.md) | Block until the first service container stops | -| [`watch`](compose_watch.md) | Watch build context for service and rebuild/refresh containers when files are updated | +| Name | Description | +|:--------------------------------|:-----------------------------------------------------------------------------------------| +| [`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 | +| [`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. | +| [`down`](compose_down.md) | Stop and remove containers, networks | +| [`events`](compose_events.md) | Receive real time events from containers. | +| [`exec`](compose_exec.md) | Execute a command in a running container. | +| [`images`](compose_images.md) | List images used by the created containers | +| [`kill`](compose_kill.md) | Force stop service containers. | +| [`logs`](compose_logs.md) | View output from containers | +| [`ls`](compose_ls.md) | List running compose projects | +| [`pause`](compose_pause.md) | Pause services | +| [`port`](compose_port.md) | Print the public port for a port binding. | +| [`ps`](compose_ps.md) | List containers | +| [`pull`](compose_pull.md) | Pull service images | +| [`push`](compose_push.md) | Push service images | +| [`restart`](compose_restart.md) | Restart service containers | +| [`rm`](compose_rm.md) | Removes stopped service containers | +| [`run`](compose_run.md) | Run a one-off command on a service. | +| [`scale`](compose_scale.md) | Scale services | +| [`start`](compose_start.md) | Start services | +| [`stats`](compose_stats.md) | Display a live stream of container(s) resource usage statistics | +| [`stop`](compose_stop.md) | Stop services | +| [`top`](compose_top.md) | Display the running processes | +| [`unpause`](compose_unpause.md) | Unpause services | +| [`up`](compose_up.md) | Create and start containers | +| [`version`](compose_version.md) | Show the Docker Compose version information | +| [`wait`](compose_wait.md) | Block until the first service container stops | +| [`watch`](compose_watch.md) | Watch build context for service and rebuild/refresh containers when files are updated | ### Options diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md index ba58d73c8fe..8424d7fbce5 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_alpha_publish.md @@ -5,10 +5,11 @@ Publish compose application ### Options -| Name | Type | Default | Description | -|:--------------------------|:-----|:--------|:--------------------------------| -| `--dry-run` | | | Execute command in dry run mode | -| `--resolve-image-digests` | | | Pin image tags to digests. | +| Name | Type | Default | Description | +|:--------------------------|:---------|:--------|:-------------------------------------------------------------------------------| +| `--dry-run` | | | Execute command in dry run mode | +| `--oci-version` | `string` | | OCI Image/Artifact specification version (automatically determined by default) | +| `--resolve-image-digests` | | | Pin image tags to digests. | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md new file mode 100644 index 00000000000..405fed98ad0 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md @@ -0,0 +1,18 @@ +# docker compose attach + + +Attach local standard input, output, and error streams to a service's running container. + +### Options + +| Name | Type | Default | Description | +|:----------------|:---------|:--------|:----------------------------------------------------------| +| `--detach-keys` | `string` | | Override the key sequence for detaching from a container. | +| `--dry-run` | | | Execute command in dry run mode | +| `--index` | `int` | `0` | index of the container if service has multiple replicas. | +| `--no-stdin` | | | Do not attach STDIN | +| `--sig-proxy` | | | Proxy all received signals to the process | + + + + 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 1eaec63e83e..46bcedbbe7b 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 @@ -5,17 +5,18 @@ Build or rebuild services ### Options -| Name | Type | Default | Description | -|:-----------------|:--------------|:--------|:------------------------------------------------------------------------------------------------------------| -| `--build-arg` | `stringArray` | | Set build-time variables for services. | -| `--builder` | `string` | | Set builder to use. | -| `--dry-run` | | | Execute command in dry run mode | -| `-m`, `--memory` | `bytes` | `0` | Set memory limit for the build container. Not supported by BuildKit. | -| `--no-cache` | | | Do not use cache when building the image | -| `--pull` | | | Always attempt to pull a newer version of the image. | -| `--push` | | | Push service images. | -| `-q`, `--quiet` | | | Don't print anything to STDOUT | -| `--ssh` | `string` | | Set SSH authentications used when building service images. (use 'default' for using your default SSH Agent) | +| Name | Type | Default | Description | +|:----------------------|:--------------|:--------|:------------------------------------------------------------------------------------------------------------| +| `--build-arg` | `stringArray` | | Set build-time variables for services. | +| `--builder` | `string` | | Set builder to use. | +| `--dry-run` | | | Execute command in dry run mode | +| `-m`, `--memory` | `bytes` | `0` | Set memory limit for the build container. Not supported by BuildKit. | +| `--no-cache` | | | Do not use cache when building the image | +| `--pull` | | | Always attempt to pull a newer version of the image. | +| `--push` | | | Push service images. | +| `-q`, `--quiet` | | | Don't print anything to STDOUT | +| `--ssh` | `string` | | Set SSH authentications used when building service images. (use 'default' for using your default SSH Agent) | +| `--with-dependencies` | | | Also build dependencies (transitively). | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_logs.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_logs.md index 58f56ed09c8..b6c705bab29 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_logs.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_logs.md @@ -9,6 +9,7 @@ View output from containers |:---------------------|:---------|:--------|:-----------------------------------------------------------------------------------------------| | `--dry-run` | | | Execute command in dry run mode | | `-f`, `--follow` | | | Follow log output. | +| `--index` | `int` | `0` | index of the container if service has multiple replicas | | `--no-color` | | | Produce monochrome output. | | `--no-log-prefix` | | | Don't print prefix in logs. | | `--since` | `string` | | Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes) | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md index b73cae5d7a6..81ef2550981 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_ps.md @@ -12,6 +12,7 @@ List containers | [`--filter`](#filter) | `string` | | Filter services by a property (supported filters: status). | | [`--format`](#format) | `string` | `table` | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates | | `--no-trunc` | | | Don't truncate output | +| `--orphans` | | | Include orphaned services (not declared by project) | | `-q`, `--quiet` | | | Only display IDs | | `--services` | | | Display services | | [`--status`](#status) | `stringArray` | | Filter services by status. Values: [paused \| restarting \| removing \| running \| dead \| created \| exited] | 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 3eea660e533..033ac5e78db 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 @@ -5,29 +5,29 @@ Run a one-off command on a service. ### Options -| Name | Type | Default | Description | -|:----------------------|:--------------|:--------|:----------------------------------------------------------------------------------| -| `--build` | | | Build image before starting container. | -| `--cap-add` | `list` | | Add Linux capabilities | -| `--cap-drop` | `list` | | Drop Linux capabilities | -| `-d`, `--detach` | | | Run container in background and print container ID | -| `--dry-run` | | | Execute command in dry run mode | -| `--entrypoint` | `string` | | Override the entrypoint of the image | -| `-e`, `--env` | `stringArray` | | Set environment variables | -| `-i`, `--interactive` | | | Keep STDIN open even if not attached. | -| `-l`, `--label` | `stringArray` | | Add or override a label | -| `--name` | `string` | | Assign a name to the container | -| `-T`, `--no-TTY` | | | Disable pseudo-TTY allocation (default: auto-detected). | -| `--no-deps` | | | Don't start linked services. | -| `-p`, `--publish` | `stringArray` | | Publish a container's port(s) to the host. | -| `--quiet-pull` | | | Pull without printing progress information. | -| `--remove-orphans` | | | Remove containers for services not defined in the Compose file. | -| `--rm` | | | Automatically remove the container when it exits | -| `--service-ports` | | | Run command with the service's ports enabled and mapped to the host. | -| `--use-aliases` | | | Use the service's network useAliases in the network(s) the container connects to. | -| `-u`, `--user` | `string` | | Run as specified username or uid | -| `-v`, `--volume` | `stringArray` | | Bind mount a volume. | -| `-w`, `--workdir` | `string` | | Working directory inside the container | +| Name | Type | Default | Description | +|:------------------------|:--------------|:--------|:----------------------------------------------------------------------------------| +| `--build` | | | Build image before starting container. | +| `--cap-add` | `list` | | Add Linux capabilities | +| `--cap-drop` | `list` | | Drop Linux capabilities | +| `-d`, `--detach` | | | Run container in background and print container ID | +| `--dry-run` | | | Execute command in dry run mode | +| `--entrypoint` | `string` | | Override the entrypoint of the image | +| `-e`, `--env` | `stringArray` | | Set environment variables | +| `-i`, `--interactive` | | | Keep STDIN open even if not attached. | +| `-l`, `--label` | `stringArray` | | Add or override a label | +| `--name` | `string` | | Assign a name to the container | +| `-T`, `--no-TTY` | | | Disable pseudo-TTY allocation (default: auto-detected). | +| `--no-deps` | | | Don't start linked services. | +| `-p`, `--publish` | `stringArray` | | Publish a container's port(s) to the host. | +| `--quiet-pull` | | | Pull without printing progress information. | +| `--remove-orphans` | | | Remove containers for services not defined in the Compose file. | +| `--rm` | | | Automatically remove the container when it exits | +| `-P`, `--service-ports` | | | Run command with all service's ports enabled and mapped to the host. | +| `--use-aliases` | | | Use the service's network useAliases in the network(s) the container connects to. | +| `-u`, `--user` | `string` | | Run as specified username or uid | +| `-v`, `--volume` | `stringArray` | | Bind mount a volume. | +| `-w`, `--workdir` | `string` | | Working directory inside the container | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md new file mode 100644 index 00000000000..acb22840b39 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_stats.md @@ -0,0 +1,18 @@ +# docker compose stats + + +Display a live stream of container(s) resource usage statistics + +### Options + +| Name | Type | Default | Description | +|:--------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `-a`, `--all` | | | Show all containers (default shows just running) | +| `--dry-run` | | | Execute command in dry run mode | +| `--format` | `string` | | Format output using a custom template:
'table': Print output in table format with column headers (default)
'table TEMPLATE': Print output in table format using the given Go template
'json': Print in JSON format
'TEMPLATE': Print output using the given Go template.
Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates | +| `--no-stream` | | | Disable streaming stats and only pull the first result | +| `--no-trunc` | | | Do not truncate 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 c096f892305..83f555b6c89 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 @@ -146,6 +146,7 @@ usage: docker compose pname: docker plink: docker.yaml cname: + - docker compose attach - docker compose build - docker compose config - docker compose cp @@ -167,6 +168,7 @@ cname: - docker compose run - docker compose scale - docker compose start + - docker compose stats - docker compose stop - docker compose top - docker compose unpause @@ -175,6 +177,7 @@ cname: - docker compose wait - docker compose watch clink: + - docker_compose_attach.yaml - docker_compose_build.yaml - docker_compose_config.yaml - docker_compose_cp.yaml @@ -196,6 +199,7 @@ clink: - docker_compose_run.yaml - docker_compose_scale.yaml - docker_compose_start.yaml + - docker_compose_stats.yaml - docker_compose_stop.yaml - docker_compose_top.yaml - docker_compose_unpause.yaml 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 266e894c437..f2237f2ae43 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 @@ -5,6 +5,16 @@ usage: docker compose alpha publish [OPTIONS] [REPOSITORY] pname: docker compose alpha plink: docker_compose_alpha.yaml options: + - option: oci-version + value_type: string + description: | + OCI Image/Artifact specification version (automatically determined by default) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: resolve-image-digests value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_attach.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_attach.yaml new file mode 100644 index 00000000000..14c584f4115 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_attach.yaml @@ -0,0 +1,66 @@ +command: docker compose attach +short: | + Attach local standard input, output, and error streams to a service's running container. +long: | + Attach local standard input, output, and error streams to a service's running container. +usage: docker compose attach [OPTIONS] SERVICE +pname: docker compose +plink: docker_compose.yaml +options: + - option: detach-keys + value_type: string + description: Override the key sequence for detaching from a container. + 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: no-stdin + value_type: bool + default_value: "false" + description: Do not attach STDIN + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: sig-proxy + value_type: bool + default_value: "true" + description: Proxy all received signals to the process + 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 af758d4fb71..d6085d0d155 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 @@ -147,6 +147,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: with-dependencies + value_type: bool + default_value: "false" + description: Also build dependencies (transitively). + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false inherited_options: - option: dry-run value_type: bool diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_logs.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_logs.yaml index 3a13cb2930c..fe6bbdb424f 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_logs.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_logs.yaml @@ -16,6 +16,16 @@ options: 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: no-color value_type: bool default_value: "false" diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ps.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ps.yaml index 9e6bb072ec1..78842a99908 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ps.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_ps.yaml @@ -70,6 +70,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: orphans + value_type: bool + default_value: "true" + description: Include orphaned services (not declared by project) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: quiet shorthand: q value_type: bool 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 d827dc339fc..12abafc3b69 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 @@ -211,10 +211,11 @@ options: kubernetes: false swarm: false - option: service-ports + shorthand: P value_type: bool default_value: "false" description: | - Run command with the service's ports enabled and mapped to the host. + Run command with all service's ports enabled and mapped to the host. deprecated: false hidden: false experimental: false diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml new file mode 100644 index 00000000000..cd8e801b321 --- /dev/null +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_stats.yaml @@ -0,0 +1,71 @@ +command: docker compose stats +short: Display a live stream of container(s) resource usage statistics +long: Display a live stream of container(s) resource usage statistics +usage: docker compose stats [OPTIONS] [SERVICE] +pname: docker compose +plink: docker_compose.yaml +options: + - option: all + shorthand: a + value_type: bool + default_value: "false" + description: Show all containers (default shows just running) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: format + value_type: string + description: |- + Format output using a custom template: + 'table': Print output in table format with column headers (default) + 'table TEMPLATE': Print output in table format using the given Go template + 'json': Print in JSON format + 'TEMPLATE': Print output using the given Go template. + Refer to https://docs.docker.com/go/formatting/ for more information about formatting output with templates + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: no-stream + value_type: bool + default_value: "false" + description: Disable streaming stats and only pull the first result + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: no-trunc + value_type: bool + default_value: "false" + description: Do not truncate output + 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/modules.txt b/_vendor/modules.txt index 275bd8562a7..9b9b3db6143 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/moby/moby v24.0.5+incompatible -# github.com/moby/buildkit v0.13.0-beta1.0.20231214000015-a960fe501f00 +# github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991 # github.com/docker/buildx v0.12.1-0.20231214091505-b68ee824c673 # github.com/docker/scout-cli v1.2.0 -# github.com/docker/cli v25.0.0-beta.1+incompatible +# github.com/docker/cli v25.0.0-rc.1+incompatible # github.com/compose-spec/compose-spec v0.0.0-20231121152139-478928e7c9f8 -# github.com/docker/compose/v2 v2.23.3 +# github.com/docker/compose/v2 v2.24.0 diff --git a/content/compose/release-notes.md b/content/compose/release-notes.md index 450324d4363..09a56b3f9af 100644 --- a/content/compose/release-notes.md +++ b/content/compose/release-notes.md @@ -11,6 +11,32 @@ aliases: For more detailed information, see the [release notes in the Compose repo](https://github.com/docker/compose/releases/). +## 2.24.0 +{{< release-date date="2024-01-11" >}} + +### Update +- 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 + +### 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. +- Added source policies for build. +- Included disabled services for shell completion. +- Restored `Project` in ps JSON output. +- Added OCI 1.0 fallback support for AWS ECR. +- Build now does not require environment to be resolved. +- Compose now sends out a cancel event on SIGINT/SIGTERM signal for `compose up`. +- Fixed log by exposing services ports when `--verbose`. +- Fixed inlined and environment-defined configs to be mounted under /\ until an explicit target is set. +- Fixed combination of `--pull always --no-build`. +- Fixed race condition in log printer. +- Fixed `docker compose up` teardown when command context is cancelled. + ## 2.23.3 {{< release-date date="2023-11-22" >}} diff --git a/go.mod b/go.mod index 419499e1637..53c690734e6 100644 --- a/go.mod +++ b/go.mod @@ -7,10 +7,10 @@ toolchain go1.21.1 require ( github.com/compose-spec/compose-spec v0.0.0-20231121152139-478928e7c9f8 // indirect github.com/docker/buildx v0.12.1-0.20231214091505-b68ee824c673 // indirect - github.com/docker/cli v25.0.0-beta.1+incompatible // indirect - github.com/docker/compose/v2 v2.23.3 // indirect + github.com/docker/cli v25.0.0-rc.1+incompatible // indirect + github.com/docker/compose/v2 v2.24.0 // indirect github.com/docker/scout-cli v1.2.0 // indirect - github.com/moby/buildkit v0.13.0-beta1.0.20231214000015-a960fe501f00 // indirect + github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991 // indirect github.com/moby/moby v24.0.5+incompatible // indirect ) diff --git a/go.sum b/go.sum index 918f5c4aaec..41346f4e5ee 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,8 @@ github.com/docker/compose/v2 v2.23.1 h1:wLgblcBfAgbXeNaxxKAIL//I+xgoyZ1BBbWFNfoL github.com/docker/compose/v2 v2.23.1/go.mod h1:FCqosV9Gc3/QOoRgYSjVnweNqDyr6LsAyLca5VPrEGU= github.com/docker/compose/v2 v2.23.3 h1:2p2biZqpUvPzC8J7nDl+ankVQNCCAk2IZJ4eg1S+6BE= github.com/docker/compose/v2 v2.23.3/go.mod h1:lUweVMN13YR0a9M7qdKulTSMS1kYdAysYNJlFEnDMCw= +github.com/docker/compose/v2 v2.24.0 h1:Gvmg3E5/Rqa4G340sYcUk/DIegT5Nod2ZV3MqR248j8= +github.com/docker/compose/v2 v2.24.0/go.mod h1:sDypMTKq6Mrp0W5NZ6+uiqxR9zEukI1RVuFRqwBTljs= 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/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q= @@ -157,6 +159,8 @@ github.com/moby/buildkit v0.13.0-beta1.0.20231113205014-1efcd30d9dd6 h1:gfbjHMad github.com/moby/buildkit v0.13.0-beta1.0.20231113205014-1efcd30d9dd6/go.mod h1:VE6gCOYRW2hbxnxtt7udKkYMF73YdvkgIrGhkB0EiDA= github.com/moby/buildkit v0.13.0-beta1.0.20231214000015-a960fe501f00 h1:Ymp+x/hsr6M6R+6j4XVyGaRrhAt1MnGXoN+ZkQ+TuuA= github.com/moby/buildkit v0.13.0-beta1.0.20231214000015-a960fe501f00/go.mod h1:6MddWPSL5jxy+W8eMMHWDOfZzzRRKWXPZqajw72YHBc= +github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991 h1:r80LLQ91uOLxU1ElAvrB1o8oBsph51lPzVnr7t2b200= +github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991/go.mod h1:6MddWPSL5jxy+W8eMMHWDOfZzzRRKWXPZqajw72YHBc= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/moby v24.0.2+incompatible h1:yH+5dRHH1x3XRKzl1THA2aGTy6CHYnkt5N924ADMax8= github.com/moby/moby v24.0.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= diff --git a/hugo.yaml b/hugo.yaml index 6b8b6b42ffb..9e05675f164 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -93,7 +93,7 @@ params: latest_engine_api_version: "1.43" docker_ce_version: "24.0.7" - compose_version: "v2.23.3" + compose_version: "v2.24.0" compose_file_v3: "3.8" compose_file_v2: "2.4" buildkit_version: "0.12.3"