Add -bip flag: allow specification of dynamic bridge IP via CIDR

e.g.:

```
docker -d -bip "10.10.0.1/16"
```

If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
This commit is contained in:
WarheadsSE
2013-12-13 10:47:19 -05:00
parent 1e4a06b36d
commit ca9e7bd94d
4 changed files with 30 additions and 12 deletions

View File

@ -30,6 +30,7 @@ To list available commands, either run ``docker`` with no parameters or execute
-H=[unix:///var/run/docker.sock]: Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise
-api-enable-cors=false: Enable CORS headers in the remote API
-b="": Attach containers to a pre-existing network bridge; use 'none' to disable container networking
-bip="": Use the provided CIDR notation address for the dynamically created bridge (docker0); Mutually exclusive of -b
-d=false: Enable daemon mode
-dns="": Force docker to use specific DNS servers
-g="/var/lib/docker": Path to use as the root of the docker runtime