toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
72db6e475ac227b064b1ca9165e189cc408e3825
docker-cli/components/engine/daemon
History
Yong Tang 72db6e475a Fix issue for --fixed-cidr when bridge has multiple addresses 
This fix tries to address the issue raised in 26341
where multiple addresses in a bridge may cause `--fixed-cidr`
to not have the correct addresses.

The issue is that `netutils.ElectInterfaceAddresses(bridgeName)`
only returns the first IPv4 address.

This fix (together with the PR created in libnetwork )
changes `ElectInterfaceAddresses()` and `addresses()`
so that all IPv4 addresses are returned. This will allow the
possibility of selectively choose the address needed.

In `daemon_unix.go`, bridge address is chosen by comparing with
the `--fixed-cidr` first, thus resolve the issue in 26341.

This fix is tested manually, as is described in 26341:
```
brctl addbr cbr0
ip addr add 10.111.111.111/20 dev cbr0 label cbr0:main
ip addr add 10.222.222.222/12 dev cbr0 label cbr0:docker
ip link set cbr0 up
docker daemon --bridge=cbr0 --iptables=false --ip-masq=false --fixed-cidr=10.222.222.222/24
docker run --rm busybox ip route get 8.8.8.8 | grep -Po 'src.*'
src 10.222.222.0
```

This fix fixes 26341.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e9c4c513d11e6c3986f8858b9a11535d61cfdf74
Component: engine
2016-10-26 20:11:29 -07:00
..
caps
…
cluster
cluster/container: correctly name swarm tasks
2016-10-25 14:17:57 -07:00
events
test: fix trivial code convention noncompliance
2016-09-12 07:36:52 +00:00
exec
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
graphdriver
Make experimental a runtime flag
2016-10-24 15:20:01 -07:00
links
…
logger
Merge pull request #27471 from caarlos0/logentries
2016-10-18 01:33:28 -07:00
network
Fix autostart for swarm scope connected containers
2016-09-13 14:21:58 -07:00
apparmor_default_unsupported.go
…
apparmor_default.go
…
archive_unix.go
Windows: docker cp consistent paths
2016-05-06 16:08:53 -07:00
archive_windows.go
…
archive.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
attach.go
Move errors/ to api/errors
2016-09-16 12:27:13 -04:00
auth.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
cache.go
Implement build cache based on history array
2016-09-23 11:30:06 -07:00
changes.go
Move some container related methods and structs to smaller files
2016-05-24 21:31:15 +02:00
checkpoint.go
change-code-and-fix-docs-about-checkpoint
2016-09-23 19:37:43 +08:00
cluster.go
add docker network prune
2016-10-25 06:43:54 +00:00
commit.go
pkg/archive: remove unnecessary Archive and Reader type
2016-10-20 19:31:24 -07:00
config_experimental.go
Make experimental a runtime flag
2016-10-24 15:20:01 -07:00
config_solaris.go
Convert dockerd to use cobra and pflag
2016-08-25 13:09:03 -04:00
config_test.go
fix config load error with ulimits
2016-10-17 18:48:40 +08:00
config_unix_test.go
fix config load error with ulimits
2016-10-17 18:48:40 +08:00
config_unix.go
Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
2016-10-26 11:33:06 -04:00
config_windows_test.go
fix config load error with ulimits
2016-10-17 18:48:40 +08:00
config_windows.go
Windows: Calculate PID file after root
2016-10-17 11:48:51 -07:00
config.go
Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys
2016-10-24 18:12:28 -07:00
container_operations_solaris.go
Fixed support for docker compose by allowing connect/disconnect on stopped containers
2016-09-21 13:29:17 -07:00
container_operations_unix.go
Merge pull request #27367 from Microsoft/jjh/fieldsincontainer
2016-10-17 16:50:39 +02:00
container_operations_windows.go
Windows: Factor out unused fields in container
2016-10-13 14:51:10 -07:00
container_operations.go
Delete a redundant error return
2016-10-22 08:53:57 +08:00
container.go
Move errors/ to api/errors
2016-09-16 12:27:13 -04:00
create_unix.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
create_windows.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
create.go
Delete a redundant error return
2016-10-22 08:53:57 +08:00
daemon_experimental.go
Make experimental a runtime flag
2016-10-24 15:20:01 -07:00
daemon_linux_test.go
…
daemon_linux.go
…
daemon_solaris.go
daemon: do not use pointers to map
2016-10-10 11:37:36 -07:00
daemon_test.go
support insecure registry in configuration reload
2016-10-20 07:54:31 +08:00
daemon_unix_test.go
Initialize libnetwork and IPAMDriver with pluginstore.
2016-10-03 10:40:05 -07:00
daemon_unix.go
Fix issue for --fixed-cidr when bridge has multiple addresses
2016-10-26 20:11:29 -07:00
daemon_unsupported.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
daemon_windows.go
Windows: Add comment re client containers
2016-10-25 10:30:00 -07:00
daemon.go
Merge pull request #27525 from AkihiroSuda/prune-network-cluster
2016-10-25 09:02:28 -07:00
debugtrap_unix.go
Windows: Stack dump to file
2016-07-21 20:04:47 -07:00
debugtrap_unsupported.go
Windows: Stack dump to file
2016-07-21 20:04:47 -07:00
debugtrap_windows.go
Windows: Set ACL on debug listener
2016-10-14 09:15:17 -07:00
delete_test.go
make client side know container removal in progress
2016-09-27 18:06:54 +08:00
delete.go
make client side know container removal in progress
2016-09-27 18:06:54 +08:00
discovery_test.go
validate heartbeat in discovery cluster opts
2016-09-01 01:07:05 +08:00
discovery.go
validate heartbeat in discovery cluster opts
2016-09-01 01:07:05 +08:00
disk_usage.go
Add swagger.yaml
2016-10-20 13:24:23 -07:00
errors.go
Move errors/ to api/errors
2016-09-16 12:27:13 -04:00
events_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
events.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
exec_linux.go
Remove hacked Windows OCI spec, compile fixups
2016-09-27 12:07:35 -07:00
exec_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
exec_windows.go
…
exec.go
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
export.go
pkg/archive: remove unnecessary Archive and Reader type
2016-10-20 19:31:24 -07:00
health_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
health.go
Reset health status to starting when a container is restarted
2016-10-14 15:49:12 +01:00
image_delete.go
Merge pull request #26616 from tonistiigi/id-digest
2016-09-18 09:40:16 -04:00
image_exporter.go
Move some image related methods & struct to smaller files
2016-05-21 22:36:11 +02:00
image_history.go
Generalize content addressable and reference storage
2016-09-15 18:08:19 -07:00
image_inspect.go
Inspect populate image OSVersion
2016-10-06 11:46:24 -07:00
image_pull.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
image_push.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
image_tag.go
Generalize content addressable and reference storage
2016-09-15 18:08:19 -07:00
image.go
Deprecate repo:shortid syntax
2016-10-06 17:12:17 -07:00
images.go
Generate api/types:Image from the swagger spec
2016-10-20 13:24:23 -07:00
import.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
info.go
Make experimental a runtime flag
2016-10-24 15:20:01 -07:00
inspect_solaris.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
inspect_unix.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
inspect_windows.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
inspect.go
record pid of exec'd process
2016-10-20 17:06:11 +02:00
keys_unsupported.go
Change root_maxkeys
2016-06-27 10:23:37 -07:00
keys.go
Change root_maxkeys
2016-06-27 10:23:37 -07:00
kill.go
Lock all calls to hcsshim to prevent close races
2016-09-19 12:59:02 -07:00
links_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
links.go
…
list_unix.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
list_windows.go
…
list.go
Generate api/types:Port from swagger spec.
2016-10-20 13:24:23 -07:00
logdrivers_linux.go
added logentries driver
2016-10-06 22:48:53 -03:00
logdrivers_windows.go
added logentries driver
2016-10-06 22:48:53 -03:00
logs_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
logs.go
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
monitor_linux.go
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 14:03:05 -07:00
monitor_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
monitor_windows.go
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
monitor.go
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
mounts.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
names.go
Added the word "container" to clarify the error message.
2016-08-22 13:41:17 -07:00
network.go
Remove duplicate nat, null in docker info for Windows
2016-10-24 15:21:14 -07:00
oci_linux.go
Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
2016-10-26 11:33:06 -04:00
oci_solaris.go
Remove hacked Windows OCI spec, compile fixups
2016-09-27 12:07:35 -07:00
oci_windows.go
Merge pull request #26965 from Microsoft/jjh/rootpath
2016-10-19 15:50:37 +02:00
pause.go
…
prune.go
add docker network prune
2016-10-25 06:43:54 +00:00
rename.go
Fix docker rename with linked containers
2016-06-27 19:58:05 -07:00
resize.go
…
restart.go
Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time.
2016-10-17 12:53:35 -07:00
search_test.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
search.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
seccomp_disabled.go
Replace old oci specs import with runtime-specs
2016-08-17 09:38:34 -07:00
seccomp_linux.go
New seccomp format
2016-09-01 11:53:07 +02:00
seccomp_unsupported.go
Fix seccomp output in docker info
2016-07-08 17:26:42 -07:00
selinux_linux.go
…
selinux_unsupported.go
…
start_linux.go
Remove restartmanager from libcontainerd
2016-10-07 12:09:54 -07:00
start_windows.go
Remove restartmanager from libcontainerd
2016-10-07 12:09:54 -07:00
start.go
Move stdio attach from libcontainerd backend to callback
2016-10-24 00:20:36 -07:00
stats_collector_solaris.go
Get the Docker Engine to build clean on Solaris
2016-05-23 16:37:12 -07:00
stats_collector_unix.go
Windows: stats support
2016-09-16 11:56:15 -07:00
stats_collector_windows.go
Windows: stats support
2016-09-16 11:56:15 -07:00
stats_collector.go
Windows: stats support
2016-09-16 11:56:15 -07:00
stats_unix.go
Removed engine-api leftovers
2016-09-21 12:36:52 +02:00
stats_windows.go
Windows: stats support
2016-09-16 11:56:15 -07:00
stats.go
Windows: stats support
2016-09-16 11:56:15 -07:00
stop.go
Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time.
2016-10-17 12:53:35 -07:00
top_unix_test.go
Validate arguments for ps in docker top
2016-07-08 05:58:11 +00:00
top_unix.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
top_windows.go
Windows: docker top implementation
2016-09-07 16:29:02 -07:00
unpause.go
remove running judgement when unpause container
2016-08-29 10:16:18 +08:00
update_linux.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
update_solaris.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
update_windows.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
update.go
Add engine-api types to docker
2016-09-07 11:05:58 -07:00
volumes_unit_test.go
…
volumes_unix.go
Add new HostConfig field, Mounts.
2016-09-13 09:55:35 -04:00
volumes_windows.go
Remove hacked Windows OCI spec, compile fixups
2016-09-27 12:07:35 -07:00
volumes.go
Show volume options for docker volume inspect
2016-10-20 05:14:27 -07:00
wait.go
Fix race on force deleting container created by task
2016-06-14 16:49:04 -07:00