From 1285bbc3c750b16f2595387fbff1a57e88bb5a5b Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 10 Jul 2025 13:32:16 +0100 Subject: [PATCH] Compose network flag2 (#23055) ## Description ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- .../docker/compose/v2/docs/reference/compose_config.md | 1 + .../v2/docs/reference/docker_compose_config.yaml | 10 ++++++++++ _vendor/modules.txt | 4 ++-- go.mod | 8 ++++---- go.sum | 4 ++++ 5 files changed, 21 insertions(+), 6 deletions(-) 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 3ec2d4864a..854eafe216 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 @@ -15,6 +15,7 @@ the canonical format. | `--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 | +| `--networks` | `bool` | | Print the network names, one per line. | | `--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 080fe6748e..b95c58c279 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 @@ -56,6 +56,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: networks + value_type: bool + default_value: "false" + description: Print the network names, one per line. + 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 2e0ca85827..1784d21178 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/moby/moby v28.3.2+incompatible -# github.com/moby/buildkit v0.23.1 +# github.com/moby/buildkit v0.23.2 # github.com/docker/buildx v0.25.0 -# github.com/docker/cli v28.3.0+incompatible +# github.com/docker/cli v28.3.1+incompatible # github.com/docker/compose/v2 v2.38.2 # github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 # github.com/docker/scout-cli v1.15.0 diff --git a/go.mod b/go.mod index d2954508b8..c3c9a29e86 100644 --- a/go.mod +++ b/go.mod @@ -16,10 +16,10 @@ require ( github.com/containerd/typeurl/v2 v2.2.3 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/buildx v0.25.0 // indirect - github.com/docker/cli v28.3.0+incompatible // indirect + github.com/docker/cli v28.3.1+incompatible // indirect github.com/docker/compose/v2 v2.38.2 // indirect github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v28.3.0+incompatible // indirect + github.com/docker/docker v28.3.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -48,7 +48,7 @@ require ( github.com/mattn/go-runewidth v0.0.16 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/moby/buildkit v0.23.1 // indirect + github.com/moby/buildkit v0.23.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/moby v28.3.2+incompatible // indirect @@ -105,7 +105,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.24.0 github.com/docker/cli => github.com/docker/cli v28.3.0+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.38.1 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.38.2 github.com/docker/model-cli => github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 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 9528e37b35..50be990992 100644 --- a/go.sum +++ b/go.sum @@ -42,12 +42,16 @@ github.com/docker/compose/v2 v2.37.3 h1:RKaTVsWmqvJd6GP9EWPZ6fu4ezl8tfG1V7bRijTo github.com/docker/compose/v2 v2.37.3/go.mod h1:U5PKGy7r7M7u2oVhz41NzlNglJFCdMrrThBOH5x00hk= github.com/docker/compose/v2 v2.38.1 h1:UNbMX6UbpdvdW3xjljD05fcL4jQmHGLh7y9VDgPp29Q= github.com/docker/compose/v2 v2.38.1/go.mod h1:0Jn/JGDGghZ9JlhY4DJY2/Cs15EDIH2nnagA66Lu3Dw= +github.com/docker/compose/v2 v2.38.2 h1:yY3jocdj1JkHbSgAyGaDLAh8fKOykZ8LVPitNOyo9/0= +github.com/docker/compose/v2 v2.38.2/go.mod h1:zigTfE9jJq/wFZPUCbNJtOC2YpSXBn0d3Xm/8EOs3Rk= 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= github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.3.0+incompatible h1:ffS62aKWupCWdvcee7nBU9fhnmknOqDPaJAMtfK0ImQ= github.com/docker/docker v28.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.3.1+incompatible h1:20+BmuA9FXlCX4ByQ0vYJcUEnOmRM6XljDnFWR+jCyY= +github.com/docker/docker v28.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=