From 581f102fa8e428decfc24e316ca571e2edffbd98 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:35:54 +0100 Subject: [PATCH] vendor: github.com/docker/compose/v2 v2.24.7 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../compose/v2/docs/reference/compose_create.md | 1 + .../docker/compose/v2/docs/reference/compose_up.md | 1 + .../v2/docs/reference/docker_compose_create.yaml | 10 ++++++++++ .../compose/v2/docs/reference/docker_compose_up.yaml | 12 ++++++++++++ _vendor/modules.txt | 6 +++--- go.mod | 5 ++--- go.sum | 2 ++ 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md b/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md index 386d6359ac..06293625a1 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md +++ b/_vendor/github.com/docker/compose/v2/docs/reference/compose_create.md @@ -13,6 +13,7 @@ Creates containers for a service | `--no-build` | | | Don't build an image, even if it's policy | | `--no-recreate` | | | If containers already exist, don't recreate them. Incompatible with --force-recreate. | | `--pull` | `string` | `policy` | Pull image before running ("always"\|"missing"\|"never"\|"build") | +| `--quiet-pull` | | | Pull without printing progress information | | `--remove-orphans` | | | Remove containers for services not defined in the Compose file | | `--scale` | `stringArray` | | Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present. | 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 38d678d00f..a34766c484 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 @@ -32,6 +32,7 @@ Create and start containers | `--timestamps` | | | Show timestamps | | `--wait` | | | 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 | +| `-w`, `--watch` | | | Watch source code and rebuild/refresh containers when files are updated. | diff --git a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml index 34425aebb8..a07e1c88cc 100644 --- a/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml +++ b/_vendor/github.com/docker/compose/v2/docs/reference/docker_compose_create.yaml @@ -57,6 +57,16 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: quiet-pull + value_type: bool + default_value: "false" + description: Pull without printing progress information + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: remove-orphans value_type: bool default_value: "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 0ed06a09b2..ec269c8b85 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 @@ -274,6 +274,18 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: watch + shorthand: w + value_type: bool + default_value: "false" + description: | + Watch source code and rebuild/refresh containers when files are updated. + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false inherited_options: - option: dry-run value_type: bool diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 60dd7b7a1d..1f7424e5b7 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v25.0.3-0.20240203133757-341a7978a541+incompatible -# github.com/moby/buildkit v0.13.0-rc3.0.20240307092343-22d4212fed7e -# github.com/docker/buildx v0.0.0-00010101000000-000000000000 +# github.com/moby/buildkit v0.13.0 +# github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315 # github.com/docker/scout-cli v1.4.1 # github.com/docker/cli v26.0.0-rc1+incompatible -# github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 +# github.com/docker/compose/v2 v2.24.7 diff --git a/go.mod b/go.mod index 363d289060..374ef69c14 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.1 require ( github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315 // indirect github.com/docker/cli v26.0.0-rc1+incompatible // indirect - github.com/docker/compose/v2 v2.0.0-00010101000000-000000000000 // indirect + github.com/docker/compose/v2 v2.24.7 // indirect github.com/docker/scout-cli v1.4.1 // indirect github.com/moby/buildkit v0.13.0 // indirect github.com/moby/moby v25.0.3-0.20240203133757-341a7978a541+incompatible // indirect @@ -16,9 +16,8 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.13.1-0.20240307093612-37b7ad1465d2 github.com/docker/cli => github.com/docker/cli v25.0.4-0.20240221083216-f67e569a8fb9+incompatible - github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.24.6 + github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.24.7 github.com/docker/scout-cli => github.com/docker/scout-cli v1.4.1 github.com/moby/buildkit => github.com/moby/buildkit v0.13.0-rc3.0.20240307092343-22d4212fed7e github.com/moby/moby => github.com/moby/moby v25.0.3-0.20240203133757-341a7978a541+incompatible ) - diff --git a/go.sum b/go.sum index 3d08aa397d..8ab2a51cf9 100644 --- a/go.sum +++ b/go.sum @@ -112,6 +112,8 @@ github.com/docker/compose/v2 v2.24.5 h1:7K173fhy+ghA88C8ib5YNa+kAZCx0CBeGW7lHcdo github.com/docker/compose/v2 v2.24.5/go.mod h1:gg+RsqCXYD/TOIJgya4N9mtj/UmFJGEls7y3h/kadVE= github.com/docker/compose/v2 v2.24.6 h1:V5fOXgga0hYy4wHsygCquO6/k++8q3WuckU7Qo1cnXk= github.com/docker/compose/v2 v2.24.6/go.mod h1:ugV3/2KoKEeM98ZYF9vsYwnSExC4xLGxblAqXB6HUXQ= +github.com/docker/compose/v2 v2.24.7 h1:1WSo4CVf18tnGJMC6V78jYsAxSDD61ry6L3JwVT+8EI= +github.com/docker/compose/v2 v2.24.7/go.mod h1:7U3QbXdRJfBylTgkdlrjOg8hWLZqM09mof9DVZ5Fh4E= 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=