From 7192b3227c37e93276d8aedf98bb66ebc41a434a Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:48:15 +0100 Subject: [PATCH] vendor: github.com/docker/cli v27.5.0 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vendor/github.com/docker/cli/docs/reference/dockerd.md | 2 -- _vendor/modules.txt | 2 +- data/engine-cli/docker_image_build.yaml | 2 -- go.mod | 4 ++-- go.sum | 2 ++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/_vendor/github.com/docker/cli/docs/reference/dockerd.md b/_vendor/github.com/docker/cli/docs/reference/dockerd.md index ae6eb2fee3..523eb82f13 100644 --- a/_vendor/github.com/docker/cli/docs/reference/dockerd.md +++ b/_vendor/github.com/docker/cli/docs/reference/dockerd.md @@ -92,7 +92,6 @@ Options: --no-new-privileges Set no-new-privileges by default for new containers --no-proxy string Comma-separated list of hosts or IP addresses for which the proxy is skipped --node-generic-resource list Advertise user-defined resource - --oom-score-adjust int Set the oom_score_adj for the daemon -p, --pidfile string Path to use for daemon PID file (default "/var/run/docker.pid") --raw-logs Full timestamps without ANSI coloring --registry-mirror list Preferred registry mirror @@ -1172,7 +1171,6 @@ The following is a full example of the allowed configuration options on Linux: "NVIDIA-GPU=UUID1", "NVIDIA-GPU=UUID2" ], - "oom-score-adjust": 0, "pidfile": "", "raw-logs": false, "registry-mirrors": [], diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 6a852c96a6..8677c07dcf 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v27.5.0+incompatible # github.com/moby/buildkit v0.18.1 # github.com/docker/buildx v0.19.2 -# github.com/docker/cli v27.4.0+incompatible +# github.com/docker/cli v27.5.0+incompatible # github.com/docker/compose/v2 v2.32.3 # github.com/docker/scout-cli v1.15.0 diff --git a/data/engine-cli/docker_image_build.yaml b/data/engine-cli/docker_image_build.yaml index 7f626cef86..2c7c1f28d4 100644 --- a/data/engine-cli/docker_image_build.yaml +++ b/data/engine-cli/docker_image_build.yaml @@ -407,8 +407,6 @@ examples: |- | `process` | Namespace isolation only. | | `hyperv` | Hyper-V hypervisor partition-based isolation. | - Specifying the `--isolation` flag without a value is the same as setting `--isolation="default"`. - ### Optional security options (--security-opt) {#security-opt} This flag is only supported on a daemon running on Windows, and only supports diff --git a/go.mod b/go.mod index 8efb952c8a..c1341861a8 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.1 require ( github.com/docker/buildx v0.19.2 // indirect - github.com/docker/cli v27.4.0+incompatible // indirect + github.com/docker/cli v27.5.0+incompatible // indirect github.com/docker/compose/v2 v2.32.3 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.18.1 // indirect @@ -13,7 +13,7 @@ require ( replace ( github.com/docker/buildx => github.com/docker/buildx v0.19.2 - github.com/docker/cli => github.com/docker/cli v27.4.0+incompatible + github.com/docker/cli => github.com/docker/cli v27.5.0+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.3 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.18.0 diff --git a/go.sum b/go.sum index 5c22be4e7a..8eb8770b72 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,8 @@ github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible h1:KqHa github.com/docker/cli v27.3.2-0.20241107125754-eb986ae71b0c+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc= github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM= +github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose-cli v1.0.35 h1:uZyEHLalfqBS2PiTpA1LAULyJmuQ+YtZg7nG4Xl3/Cc= github.com/docker/compose-cli v1.0.35/go.mod h1:mSXI4hFLpRU3EtI8NTo32bNwI0UXSr8jnq+/rYjGAUU= github.com/docker/compose/v2 v2.22.0 h1:3rRz4L7tPU75wRsV8JZh2/aTgerQvPa1cpzZN+tHqUY=