PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.
Signed-off-by: Huayi Zhang <irachex@gmail.com>
| ... | ... |
@@ -64,7 +64,7 @@ docker-create - Create a new container |
| 64 | 64 |
Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) |
| 65 | 65 |
|
| 66 | 66 |
**--dns-search**=[] |
| 67 |
- Set custom DNS search domains |
|
| 67 |
+ Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain) |
|
| 68 | 68 |
|
| 69 | 69 |
**--dns**=[] |
| 70 | 70 |
Set custom DNS servers |
| ... | ... |
@@ -103,7 +103,7 @@ stopping the process by pressing the keys CTRL-P CTRL-Q. |
| 103 | 103 |
Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) |
| 104 | 104 |
|
| 105 | 105 |
**--dns-search**=[] |
| 106 |
- Set custom DNS search domains |
|
| 106 |
+ Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain) |
|
| 107 | 107 |
|
| 108 | 108 |
**--dns**=*IP-address* |
| 109 | 109 |
Set custom DNS servers. This option can be used to override the DNS |
| ... | ... |
@@ -195,8 +195,8 @@ and foreground Docker containers. |
| 195 | 195 |
When set to true publish all exposed ports to the host interfaces. The |
| 196 | 196 |
default is false. If the operator uses -P (or -p) then Docker will make the |
| 197 | 197 |
exposed port accessible on the host and the ports will be available to any |
| 198 |
-client that can reach the host. When using -P, Docker will bind the exposed |
|
| 199 |
-ports to a random port on the host between 49153 and 65535. To find the |
|
| 198 |
+client that can reach the host. When using -P, Docker will bind the exposed |
|
| 199 |
+ports to a random port on the host between 49153 and 65535. To find the |
|
| 200 | 200 |
mapping between the host ports and the exposed ports, use **docker port**. |
| 201 | 201 |
|
| 202 | 202 |
**-p**, **--publish**=[] |
| ... | ... |
@@ -232,11 +232,11 @@ interactive shell. The default is value is false. |
| 232 | 232 |
|
| 233 | 233 |
|
| 234 | 234 |
**-v**, **--volume**=*volume*[:ro|:rw] |
| 235 |
- Bind mount a volume to the container. |
|
| 235 |
+ Bind mount a volume to the container. |
|
| 236 | 236 |
|
| 237 | 237 |
The **-v** option can be used one or |
| 238 | 238 |
more times to add one or more mounts to a container. These mounts can then be |
| 239 |
-used in other containers using the **--volumes-from** option. |
|
| 239 |
+used in other containers using the **--volumes-from** option. |
|
| 240 | 240 |
|
| 241 | 241 |
The volume may be optionally suffixed with :ro or :rw to mount the volumes in |
| 242 | 242 |
read-only or read-write mode, respectively. By default, the volumes are mounted |
| ... | ... |
@@ -247,11 +247,11 @@ read-write. See examples. |
| 247 | 247 |
Once a volume is mounted in a one container it can be shared with other |
| 248 | 248 |
containers using the **--volumes-from** option when running those other |
| 249 | 249 |
containers. The volumes can be shared even if the original container with the |
| 250 |
-mount is not running. |
|
| 250 |
+mount is not running. |
|
| 251 | 251 |
|
| 252 |
-The container ID may be optionally suffixed with :ro or |
|
| 253 |
-:rw to mount the volumes in read-only or read-write mode, respectively. By |
|
| 254 |
-default, the volumes are mounted in the same mode (read write or read only) as |
|
| 252 |
+The container ID may be optionally suffixed with :ro or |
|
| 253 |
+:rw to mount the volumes in read-only or read-write mode, respectively. By |
|
| 254 |
+default, the volumes are mounted in the same mode (read write or read only) as |
|
| 255 | 255 |
the reference container. |
| 256 | 256 |
|
| 257 | 257 |
|
| ... | ... |
@@ -14,7 +14,7 @@ Docker made the choice `172.17.42.1/16` when I started it a few minutes |
| 14 | 14 |
ago, for example — a 16-bit netmask providing 65,534 addresses for the |
| 15 | 15 |
host machine and its containers. |
| 16 | 16 |
|
| 17 |
-> **Note:** |
|
| 17 |
+> **Note:** |
|
| 18 | 18 |
> This document discusses advanced networking configuration |
| 19 | 19 |
> and options for Docker. In most cases you won't need this information. |
| 20 | 20 |
> If you're looking to get started with a simpler explanation of Docker |
| ... | ... |
@@ -170,6 +170,7 @@ Four different options affect container domain name services. |
| 170 | 170 |
When a container process attempts to access `host` and the search |
| 171 | 171 |
domain `example.com` is set, for instance, the DNS logic will not |
| 172 | 172 |
only look up `host` but also `host.example.com`. |
| 173 |
+ Use `--dns-search=.` if you don't wish to set the search domain. |
|
| 173 | 174 |
|
| 174 | 175 |
Note that Docker, in the absence of either of the last two options |
| 175 | 176 |
above, will make `/etc/resolv.conf` inside of each container look like |
| ... | ... |
@@ -113,7 +113,7 @@ proxy in front of it. You can listen on port `2375` on all network interfaces |
| 113 | 113 |
with `-H tcp://0.0.0.0:2375`, or on a particular network interface using its IP |
| 114 | 114 |
address: `-H tcp://192.168.59.103:2375`. |
| 115 | 115 |
|
| 116 |
-On Systemd based systems, you can communicate with the daemon via |
|
| 116 |
+On Systemd based systems, you can communicate with the daemon via |
|
| 117 | 117 |
[systemd socket activation](http://0pointer.de/blog/projects/socket-activation.html), use |
| 118 | 118 |
`docker -d -H fd://`. Using `fd://` will work perfectly for most setups but |
| 119 | 119 |
you can also specify individual sockets: `docker -d -H fd://3`. If the |
| ... | ... |
@@ -999,7 +999,7 @@ used, which is observable by the process being suspended. With the cgroups freez |
| 999 | 999 |
the process is unaware, and unable to capture, that it is being suspended, |
| 1000 | 1000 |
and subsequently resumed. |
| 1001 | 1001 |
|
| 1002 |
-See the |
|
| 1002 |
+See the |
|
| 1003 | 1003 |
[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt) |
| 1004 | 1004 |
for further details. |
| 1005 | 1005 |
|
| ... | ... |
@@ -1191,7 +1191,7 @@ removed before the image is removed. |
| 1191 | 1191 |
-d, --detach=false Detached mode: run the container in the background and print the new container ID |
| 1192 | 1192 |
--device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) |
| 1193 | 1193 |
--dns=[] Set custom DNS servers |
| 1194 |
- --dns-search=[] Set custom DNS search domains |
|
| 1194 |
+ --dns-search=[] Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain) |
|
| 1195 | 1195 |
-e, --env=[] Set environment variables |
| 1196 | 1196 |
--entrypoint="" Overwrite the default ENTRYPOINT of the image |
| 1197 | 1197 |
--env-file=[] Read in a line delimited file of environment variables |
| ... | ... |
@@ -1579,7 +1579,7 @@ them to [*Share Images via Repositories*]( |
| 1579 | 1579 |
The `docker unpause` command uses the cgroups freezer to un-suspend all |
| 1580 | 1580 |
processes in a container. |
| 1581 | 1581 |
|
| 1582 |
-See the |
|
| 1582 |
+See the |
|
| 1583 | 1583 |
[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroups/freezer-subsystem.txt) |
| 1584 | 1584 |
for further details. |
| 1585 | 1585 |
|