mirror of https://github.com/docker/cli.git
Merge pull request #2831 from tianon/containerd
Add "--containerd-namespace" daemon flags in completion and docs
This commit is contained in:
commit
325036df3e
|
@ -2570,6 +2570,8 @@ _docker_daemon() {
|
||||||
--cluster-store-opt
|
--cluster-store-opt
|
||||||
--config-file
|
--config-file
|
||||||
--containerd
|
--containerd
|
||||||
|
--containerd-namespace
|
||||||
|
--containerd-plugins-namespace
|
||||||
--cpu-rt-period
|
--cpu-rt-period
|
||||||
--cpu-rt-runtime
|
--cpu-rt-runtime
|
||||||
--data-root
|
--data-root
|
||||||
|
|
|
@ -2646,6 +2646,8 @@ __docker_subcommand() {
|
||||||
"($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
|
"($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
|
||||||
"($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
|
"($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
|
||||||
"($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
|
"($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
|
||||||
|
"($help)--containerd-namespace=[Containerd namespace to use]:containerd namespace:" \
|
||||||
|
"($help)--containerd-plugins-namespace=[Containerd namespace to use for plugins]:containerd namespace:" \
|
||||||
"($help)--data-root=[Root directory of persisted Docker data]:path:_directories" \
|
"($help)--data-root=[Root directory of persisted Docker data]:path:_directories" \
|
||||||
"($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
|
"($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
|
||||||
"($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
|
"($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
|
||||||
|
|
|
@ -32,6 +32,8 @@ Options:
|
||||||
--cgroup-parent string Set parent cgroup for all containers
|
--cgroup-parent string Set parent cgroup for all containers
|
||||||
--config-file string Daemon configuration file (default "/etc/docker/daemon.json")
|
--config-file string Daemon configuration file (default "/etc/docker/daemon.json")
|
||||||
--containerd string containerd grpc address
|
--containerd string containerd grpc address
|
||||||
|
--containerd-namespace string Containerd namespace to use (default "moby")
|
||||||
|
--containerd-plugins-namespace string Containerd namespace to use for plugins (default "plugins.moby")
|
||||||
--cpu-rt-period int Limit the CPU real-time period in microseconds for the
|
--cpu-rt-period int Limit the CPU real-time period in microseconds for the
|
||||||
parent cgroup for all containers
|
parent cgroup for all containers
|
||||||
--cpu-rt-runtime int Limit the CPU real-time runtime in microseconds for the
|
--cpu-rt-runtime int Limit the CPU real-time runtime in microseconds for the
|
||||||
|
@ -1344,6 +1346,9 @@ This is a full example of the allowed configuration options on Linux:
|
||||||
"cluster-advertise": "",
|
"cluster-advertise": "",
|
||||||
"cluster-store": "",
|
"cluster-store": "",
|
||||||
"cluster-store-opts": {},
|
"cluster-store-opts": {},
|
||||||
|
"containerd": "/run/containerd/containerd.sock",
|
||||||
|
"containerd-namespace": "docker",
|
||||||
|
"containerd-plugin-namespace": "docker-plugins",
|
||||||
"data-root": "",
|
"data-root": "",
|
||||||
"debug": true,
|
"debug": true,
|
||||||
"default-address-pools": [
|
"default-address-pools": [
|
||||||
|
@ -1463,6 +1468,9 @@ This is a full example of the allowed configuration options on Windows:
|
||||||
"bridge": "",
|
"bridge": "",
|
||||||
"cluster-advertise": "",
|
"cluster-advertise": "",
|
||||||
"cluster-store": "",
|
"cluster-store": "",
|
||||||
|
"containerd": "\\\\.\\pipe\\containerd-containerd",
|
||||||
|
"containerd-namespace": "docker",
|
||||||
|
"containerd-plugin-namespace": "docker-plugins",
|
||||||
"data-root": "",
|
"data-root": "",
|
||||||
"debug": true,
|
"debug": true,
|
||||||
"default-ulimits": {},
|
"default-ulimits": {},
|
||||||
|
|
Loading…
Reference in New Issue