Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make experimental a runtime flag 

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-10-06 07:09:54 -07:00 committed by Tibor Vass
parent 4df7e0a9fa
commit 47b507e48a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/commandline/dockerd.md
View File

@ -45,6 +45,7 @@ Options:
--dns-search value DNS search domains to use (default []) --dns-search value DNS search domains to use (default [])
--exec-opt value Runtime execution options (default []) --exec-opt value Runtime execution options (default [])
--exec-root string Root directory for execution state files (default "/var/run/docker") --exec-root string Root directory for execution state files (default "/var/run/docker")
--experimental Enable experimental features
--fixed-cidr string IPv4 subnet for fixed IPs --fixed-cidr string IPv4 subnet for fixed IPs
--fixed-cidr-v6 string IPv6 subnet for fixed IPs --fixed-cidr-v6 string IPv6 subnet for fixed IPs
-g, --graph string Root of the Docker runtime (default "/var/lib/docker") -g, --graph string Root of the Docker runtime (default "/var/lib/docker")
@ -1114,6 +1115,7 @@ This is a full example of the allowed configuration options on Linux:
"dns-search": [], "dns-search": [],
"exec-opts": [], "exec-opts": [],
"exec-root": "", "exec-root": "",
"experimental": false,
"storage-driver": "", "storage-driver": "",
"storage-opts": [], "storage-opts": [],
"labels": [], "labels": [],
@ -1195,6 +1197,7 @@ This is a full example of the allowed configuration options on Windows:
"dns-opts": [], "dns-opts": [],
"dns-search": [], "dns-search": [],
"exec-opts": [], "exec-opts": [],
"experimental": false,
"storage-driver": "", "storage-driver": "",
"storage-opts": [], "storage-opts": [],
"labels": [], "labels": [],

4
man/dockerd.8.md
View File

@ -27,6 +27,7 @@ dockerd - Enable daemon mode
[**--dns-search**[=*[]*]] [**--dns-search**[=*[]*]]
[**--exec-opt**[=*[]*]] [**--exec-opt**[=*[]*]]
[**--exec-root**[=*/var/run/docker*]] [**--exec-root**[=*/var/run/docker*]]
[**--experimental**[=*false*]]
[**--fixed-cidr**[=*FIXED-CIDR*]] [**--fixed-cidr**[=*FIXED-CIDR*]]
[**--fixed-cidr-v6**[=*FIXED-CIDR-V6*]] [**--fixed-cidr-v6**[=*FIXED-CIDR-V6*]]
[**-G**|**--group**[=*docker*]] [**-G**|**--group**[=*docker*]]
@ -146,6 +147,9 @@ format.
**--exec-root**="" **--exec-root**=""
Path to use as the root of the Docker execution state files. Default is `/var/run/docker`. Path to use as the root of the Docker execution state files. Default is `/var/run/docker`.
**--experimental**=""
Enable the daemon experimental features.
**--fixed-cidr**="" **--fixed-cidr**=""
IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in the bridge subnet (which is defined by \-b or \-\-bip) IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in the bridge subnet (which is defined by \-b or \-\-bip)