Signed-off-by: Huayi Zhang <irachex@gmail.com>
| ... | ... |
@@ -489,7 +489,7 @@ Creates a new container. |
| 489 | 489 |
--cpuset="" CPUs in which to allow execution (0-3, 0,1) |
| 490 | 490 |
--device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) |
| 491 | 491 |
--dns=[] Set custom DNS servers |
| 492 |
- --dns-search=[] Set custom DNS search domains |
|
| 492 |
+ --dns-search=[] Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain) |
|
| 493 | 493 |
-e, --env=[] Set environment variables |
| 494 | 494 |
--entrypoint="" Overwrite the default ENTRYPOINT of the image |
| 495 | 495 |
--env-file=[] Read in a line delimited file of environment variables |
| ... | ... |
@@ -73,7 +73,7 @@ func Parse(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Config, |
| 73 | 73 |
cmd.Var(&flPublish, []string{"p", "-publish"}, fmt.Sprintf("Publish a container's port to the host\nformat: %s\n(use 'docker port' to see the actual mapping)", nat.PortSpecTemplateFormat))
|
| 74 | 74 |
cmd.Var(&flExpose, []string{"#expose", "-expose"}, "Expose a port from the container without publishing it to your host")
|
| 75 | 75 |
cmd.Var(&flDns, []string{"#dns", "-dns"}, "Set custom DNS servers")
|
| 76 |
- cmd.Var(&flDnsSearch, []string{"-dns-search"}, "Set custom DNS search domains")
|
|
| 76 |
+ cmd.Var(&flDnsSearch, []string{"-dns-search"}, "Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)")
|
|
| 77 | 77 |
cmd.Var(&flExtraHosts, []string{"-add-host"}, "Add a custom host-to-IP mapping (host:ip)")
|
| 78 | 78 |
cmd.Var(&flVolumesFrom, []string{"#volumes-from", "-volumes-from"}, "Mount volumes from the specified container(s)")
|
| 79 | 79 |
cmd.Var(&flLxcOpts, []string{"#lxc-conf", "-lxc-conf"}, "(lxc exec-driver only) Add custom lxc options --lxc-conf=\"lxc.cgroup.cpuset.cpus = 0,1\"")
|