1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/api/server/router
Yong Tang a64c9357ca Fix incorrect Scope in network ls/inspect with duplicate network names
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.

The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.

This fix fixes the issue by always use network ID in `buildNetworkResource()`.

A test has been added. The test fails before the fix and passes after the fix.

This fix fixes 30242.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 05a831a775)
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-25 22:13:13 -08:00
..
build Fix processing of unset build-args during build 2016-12-09 14:24:00 -08:00
checkpoint router: Return explicit error rather than 404 for experimental. 2016-11-19 23:47:12 -08:00
container add headers when using exec 2016-12-09 14:12:09 -08:00
image Convert DanglingOnly to Filters for docker image prune 2016-12-07 16:08:18 -08:00
network Fix incorrect Scope in network ls/inspect with duplicate network names 2017-01-25 22:13:13 -08:00
plugin Implement content addressability for plugins 2016-12-27 13:31:14 -08:00
swarm correct the http return code of secret remove 2016-11-30 14:12:22 -08:00
system api: types: keep info.SecurityOptions a string slice 2016-11-21 14:45:05 -08:00
volume Convert DanglingOnly to Filters for docker image prune 2016-12-07 16:08:18 -08:00
experimental.go router: Return explicit error rather than 404 for experimental. 2016-11-19 23:47:12 -08:00
local.go api/server/router: add Cancellable function 2016-03-25 10:19:23 -07:00
router.go Decouple the "container" router from the actual daemon implementation. 2016-02-08 11:30:57 -05:00