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 index 5a03388192..6d5cff9d98 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_attach.md @@ -11,7 +11,7 @@ Attach local standard input, output, and error streams to a service's running co | `--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 | +| `--sig-proxy` | `bool` | `true` | 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 a0ceb050c0..271dfcde7b 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 @@ -23,7 +23,7 @@ Build or rebuild services ## Description -Services are built once and then tagged, by default as `project_service`. +Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an [image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, 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 fd213b4c38..e38eb5c654 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 @@ -13,18 +13,19 @@ Parse, resolve and render compose file in canonical format |:--------------------------|:---------|:--------|:----------------------------------------------------------------------------| | `--dry-run` | | | Execute command in dry run mode | | `--format` | `string` | `yaml` | Format the output. Values: [yaml \| json] | -| `--hash` | `string` | | Print the service config hash, one per line | -| `--images` | | | Print the image names, one per line | +| `--hash` | `string` | | Print the service config hash, one per line. | +| `--images` | | | Print the image names, one per line. | | `--no-consistency` | | | Don't check model consistency - warning: may produce invalid Compose output | | `--no-interpolate` | | | Don't interpolate environment variables | | `--no-normalize` | | | Don't normalize compose model | | `--no-path-resolution` | | | Don't resolve file paths | | `-o`, `--output` | `string` | | Save to file (default to stdout) | -| `--profiles` | | | Print the profile names, one per line | +| `--profiles` | | | Print the profile names, one per line. | | `-q`, `--quiet` | | | Only validate the configuration, don't print anything | | `--resolve-image-digests` | | | Pin image tags to digests | -| `--services` | | | Print the service names, one per line | -| `--volumes` | | | Print the volume names, one per line | +| `--services` | | | Print the service names, one per line. | +| `--variables` | | | Print model variables and default values. | +| `--volumes` | | | Print the volume names, one per line. | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md index fab8221782..d647ea0e49 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_exec.md @@ -11,7 +11,7 @@ Execute a command in a running container | `--dry-run` | | | Execute command in dry run mode | | `-e`, `--env` | `stringArray` | | Set environment variables | | `--index` | `int` | `0` | Index of the container if service has multiple replicas | -| `-T`, `--no-TTY` | | | Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY. | +| `-T`, `--no-TTY` | `bool` | `true` | Disable pseudo-TTY allocation. By default `docker compose exec` allocates a TTY. | | `--privileged` | | | Give extended privileges to the process | | `-u`, `--user` | `string` | | Run the command as this user | | `-w`, `--workdir` | `string` | | Path to workdir directory for this command | 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 f0c1a25762..70b409ecc0 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,7 +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) | +| `--orphans` | `bool` | `true` | 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 185b4ad073..656ea353ea 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 @@ -14,10 +14,10 @@ Run a one-off command on a service | `--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 | +| `-i`, `--interactive` | `bool` | `true` | 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) | +| `-T`, `--no-TTY` | `bool` | `true` | 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 | 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 34175696fb..1c7c2ecd9e 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 @@ -1,7 +1,7 @@ command: docker compose build short: Build or rebuild services long: |- - Services are built once and then tagged, by default as `project_service`. + Services are built once and then tagged, by default as `project-service`. If the Compose file specifies an [image](https://github.com/compose-spec/compose-spec/blob/master/spec.md#image) name, 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 ea7669b0d9..68a7b8994e 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 @@ -21,7 +21,7 @@ options: swarm: false - option: hash value_type: string - description: Print the service config hash, one per line + description: Print the service config hash, one per line. deprecated: false hidden: false experimental: false @@ -31,7 +31,7 @@ options: - option: images value_type: bool default_value: "false" - description: Print the image names, one per line + description: Print the image names, one per line. deprecated: false hidden: false experimental: false @@ -92,7 +92,7 @@ options: - option: profiles value_type: bool default_value: "false" - description: Print the profile names, one per line + description: Print the profile names, one per line. deprecated: false hidden: false experimental: false @@ -123,7 +123,17 @@ options: - option: services value_type: bool default_value: "false" - description: Print the service names, one per line + description: Print the service names, one per line. + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: variables + value_type: bool + default_value: "false" + description: Print model variables and default values. deprecated: false hidden: false experimental: false @@ -133,7 +143,7 @@ options: - option: volumes value_type: bool default_value: "false" - description: Print the volume names, one per line + description: Print the volume names, one per line. deprecated: false hidden: false experimental: 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 ec269c8b85..967a16379f 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 @@ -108,6 +108,17 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: menu + value_type: bool + default_value: "false" + description: | + Enable interactive shortcuts when running attached (Experimental). Incompatible with --detach. + deprecated: false + hidden: true + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: no-attach value_type: stringArray default_value: '[]' diff --git a/_vendor/modules.txt b/_vendor/modules.txt index e1a85630e6..803dbb9b0f 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,5 +1,5 @@ # github.com/moby/moby v26.0.0+incompatible -# github.com/moby/buildkit v0.13.0 +# github.com/moby/buildkit v0.13.1 # github.com/docker/buildx v0.13.1 # github.com/docker/cli v26.0.0+incompatible # github.com/docker/compose/v2 v2.26.1 diff --git a/go.mod b/go.mod index 009ad2e46e..8d306db8e3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.13.1 github.com/docker/cli => github.com/docker/cli v26.0.0+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.25.0 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.26.1 github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240308080452-a38011b9f57d github.com/moby/moby => github.com/moby/moby v26.0.0+incompatible ) diff --git a/go.sum b/go.sum index 0e002a869b..d9f9042520 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,8 @@ github.com/docker/compose/v2 v2.24.7 h1:1WSo4CVf18tnGJMC6V78jYsAxSDD61ry6L3JwVT+ github.com/docker/compose/v2 v2.24.7/go.mod h1:7U3QbXdRJfBylTgkdlrjOg8hWLZqM09mof9DVZ5Fh4E= github.com/docker/compose/v2 v2.25.0 h1:UMCrWFItKdXXrlbxvA63V3aFb4Nr3zmlSY2GvJIqJW0= github.com/docker/compose/v2 v2.25.0/go.mod h1:M0PSYeTsp2ZEZJGhvzNTBtJeJRN7ZBGb4Ft1mUteTac= +github.com/docker/compose/v2 v2.26.1 h1:27fAR5jVzNUYwY/9ppIjrPqGYLW5HtOTq2aYGBMCtA0= +github.com/docker/compose/v2 v2.26.1/go.mod h1:5iVCMlr18ab0NlMxIPdtTgThTkzb34Z/zj15N7KSW+s= 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=