From 24f61a25633d94f63e9b57591c33bfcf8c2c3e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 26 Feb 2025 16:32:32 +0000 Subject: [PATCH] Merge pull request #22109 from vvoland/docs-28.0.1 vendor: github.com/moby/moby and docker/cli v28.0.1 --- .../docker/cli/docs/reference/dockerd.md | 28 +++++++++---------- _vendor/modules.txt | 4 +-- go.mod | 8 +++--- go.sum | 4 +++ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/_vendor/github.com/docker/cli/docs/reference/dockerd.md b/_vendor/github.com/docker/cli/docs/reference/dockerd.md index 3c36462399..b55b66c30b 100644 --- a/_vendor/github.com/docker/cli/docs/reference/dockerd.md +++ b/_vendor/github.com/docker/cli/docs/reference/dockerd.md @@ -18,15 +18,15 @@ aliases: # daemon ```markdown -Usage: dockerd [OPTIONS] +Usage: dockerd [OPTIONS] A self-sufficient runtime for containers. Options: --add-runtime runtime Register an additional OCI compatible runtime (default []) --authorization-plugin list Authorization plugins to load - --bip string Specify default-bridge IPv4 network - --bip6 string Specify default-bridge IPv6 network + --bip string IPv4 address for the default bridge + --bip6 string IPv6 address for the default bridge -b, --bridge string Attach containers to a network bridge --cdi-spec-dir list CDI specification directories to use --cgroup-parent string Set parent cgroup for all containers @@ -43,8 +43,8 @@ Options: -D, --debug Enable debug mode --default-address-pool pool-options Default address pools for node specific local networks --default-cgroupns-mode string Default mode for containers cgroup namespace ("host" | "private") (default "private") - --default-gateway ip Container default gateway IPv4 address - --default-gateway-v6 ip Container default gateway IPv6 address + --default-gateway ip Default gateway IPv4 address for the default bridge network + --default-gateway-v6 ip Default gateway IPv6 address for the default bridge network --default-ipc-mode string Default mode for containers ipc ("shareable" | "private") (default "private") --default-network-opt mapmap Default network options (default map[]) --default-runtime string Default OCI runtime for containers (default "runc") @@ -57,8 +57,8 @@ Options: --exec-root string Root directory for execution state files (default "/var/run/docker") --experimental Enable experimental features --feature map Enable feature in the daemon - --fixed-cidr string IPv4 subnet for fixed IPs - --fixed-cidr-v6 string IPv6 subnet for fixed IPs + --fixed-cidr string IPv4 subnet for the default bridge network + --fixed-cidr-v6 string IPv6 subnet for the default bridge network -G, --group string Group for the unix socket (default "docker") --help Print usage -H, --host list Daemon socket(s) to connect to @@ -66,17 +66,17 @@ Options: Defaults to the IP addresses of the default bridge --http-proxy string HTTP proxy URL to use for outgoing traffic --https-proxy string HTTPS proxy URL to use for outgoing traffic - --icc Enable inter-container communication (default true) + --icc Enable inter-container communication for the default bridge network (default true) --init Run an init in the container to forward signals and reap processes --init-path string Path to the docker-init binary --insecure-registry list Enable insecure registry communication - --ip ip Default IP when binding container ports (default 0.0.0.0) + --ip ip Host IP for port publishing from the default bridge network (default 0.0.0.0) --ip-forward Enable IP forwarding in system configuration (default true) --ip-forward-no-drop Do not set the filter-FORWARD policy to DROP when enabling IP forwarding - --ip-masq Enable IP masquerading (default true) - --ip6tables Enable addition of ip6tables rules (experimental) + --ip-masq Enable IP masquerading for the default bridge network (default true) + --ip6tables Enable addition of ip6tables rules (default true) --iptables Enable addition of iptables rules (default true) - --ipv6 Enable IPv6 networking + --ipv6 Enable IPv6 networking for the default bridge network --label list Set key=value labels to the daemon --live-restore Enable live restore of docker when containers are still running --log-driver string Default driver for container logs (default "json-file") @@ -87,7 +87,7 @@ Options: --max-concurrent-uploads int Set the max concurrent uploads (default 5) --max-download-attempts int Set the max download attempts for each pull (default 5) --metrics-addr string Set default address and port to serve the metrics api on - --mtu int Set the containers network MTU (default 1500) + --mtu int Set the MTU for the default "bridge" network (default 1500) --network-control-plane-mtu int Network Control plane MTU (default 1500) --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 @@ -96,7 +96,7 @@ Options: --raw-logs Full timestamps without ANSI coloring --registry-mirror list Preferred registry mirror --rootless Enable rootless mode; typically used with RootlessKit - --seccomp-profile string Path to seccomp profile. Use "unconfined" to disable the default seccomp profile (default "builtin") + --seccomp-profile string Path to seccomp profile. Set to "unconfined" to disable the default seccomp profile (default "builtin") --selinux-enabled Enable selinux support --shutdown-timeout int Set the default shutdown timeout (default 15) -s, --storage-driver string Storage driver to use diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 6da2aac2c3..ad57c023be 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ -# github.com/moby/moby v28.0.0+incompatible +# github.com/moby/moby v28.0.1+incompatible # github.com/moby/buildkit v0.20.0 # github.com/docker/buildx v0.21.1 -# github.com/docker/cli v28.0.0+incompatible +# github.com/docker/cli v28.0.1+incompatible # github.com/docker/compose/v2 v2.33.1 # github.com/docker/scout-cli v1.15.0 diff --git a/go.mod b/go.mod index 5ce5d6150b..60eccd6667 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,18 @@ go 1.23.1 require ( github.com/docker/buildx v0.21.1 // indirect - github.com/docker/cli v28.0.0+incompatible // indirect + github.com/docker/cli v28.0.1+incompatible // indirect github.com/docker/compose/v2 v2.33.1 // indirect github.com/docker/scout-cli v1.15.0 // indirect github.com/moby/buildkit v0.20.0 // indirect - github.com/moby/moby v28.0.0+incompatible // indirect + github.com/moby/moby v28.0.1+incompatible // indirect ) replace ( github.com/docker/buildx => github.com/docker/buildx v0.21.1 - github.com/docker/cli => github.com/docker/cli v28.0.0+incompatible + github.com/docker/cli => github.com/docker/cli v28.0.1+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.33.1 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 github.com/moby/buildkit => github.com/moby/buildkit v0.20.0 - github.com/moby/moby => github.com/moby/moby v28.0.0+incompatible + github.com/moby/moby => github.com/moby/moby v28.0.1+incompatible ) diff --git a/go.sum b/go.sum index feb77944f5..3fab125bdc 100644 --- a/go.sum +++ b/go.sum @@ -152,6 +152,8 @@ github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3L github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+5kPCr2buA= github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs= +github.com/docker/cli v28.0.1+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= @@ -390,6 +392,8 @@ github.com/moby/moby v27.5.1+incompatible h1:/pN59F/t3U7Q4FPzV88nzqf7Fp0qqCSL2Kz github.com/moby/moby v27.5.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/moby v28.0.0+incompatible h1:D+F1Z56b/DS8J5pUkTG/stemqrvHBQ006hUqJxjV9P0= github.com/moby/moby v28.0.0+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/moby v28.0.1+incompatible h1:10ejBTwFhM3/9p6pSaKrLyXnx7QzzCmCYHAedOp67cQ= +github.com/moby/moby v28.0.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=