mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-04-23 06:05:44 +03:00
Code
22,339 Commits 17 Branches 465 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
Morgan Bauer
fffff202fc Merge pull request #20261 from tophj-ibm/change-test-to-use-variable 
Change integration test to use declared variable
 2016-02-12 07:52:51 -08:00
Christopher Jones
ce1059973a Change integration test to use variable 
Followup to #20246, changes the test to use already declared variable

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-02-11 21:20:00 -05:00
David Calavera
5ca6d3bafd Merge pull request #20250 from vieux/fix_misspell 
fix common misspells
 2016-02-11 17:22:06 -08:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Aidan Hobson Sayers
dfb00652aa Expose bridge IPv6 setting to docker network inspect 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-11 22:13:47 +00:00
Christopher Jones
045aee2002 Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart 
Fixes #19368 by waiting until all container statuses are running
before killing the daemon

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-02-11 16:47:40 -05:00
Chun Chen
c199506b59 Display internal flag on network inspect 
Also adds internal network tests for bridge network

Signed-off-by: Chun Chen <ramichen@tencent.com>
 2016-02-04 15:28:37 +08:00
Tibor Vass
f0a58947ab Merge pull request #19979 from mavenugo/gccgoci 
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
 2016-02-03 20:33:52 -05:00
Madhu Venugopal
76a765140e Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-03 14:44:55 -08:00
Alessandro Boch
9b63e4e7f5 Store endpoint config on network connect to a stopped container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-02-02 17:25:44 -08:00
Wen Cheng Ma
4f1d876e4c Add integration test for network host bind option 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-02-02 18:01:04 +08:00
Zhang Wei
62a856e912 Assert error in body of function inspectField* 
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-29 23:39:07 +08:00
Bryan Boreham
7126ecd0ad Stop referring to requested IP address as "preferred", 
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2016-01-26 15:13:26 +00:00
Alessandro Boch
733245b2e7 Save endpoint config only if endpoint creation succeeds 
- Currently it is being save upfront...

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-25 13:43:32 -08:00
David Calavera
422827fa92 Merge pull request #19527 from aboch/epc 
Move Unsupp Network & IP check to the new updateNetworkConfig() func
 2016-01-22 15:54:21 -08:00
Santhosh Manohar
da9eadb066 IT for service/network name with '.', corrected libnetwork flag for DNS 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-21 20:49:02 -08:00
Alessandro Boch
3b0d36dbc1 Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-21 10:56:01 -08:00
Wen Cheng Ma
2e6b1eb309 Fixes the typo of docker_cli_network_unix_test.go 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-21 16:37:17 +08:00
Madhu Venugopal
8799218d01 IT for remote network driver & ungraceful restart 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-19 14:09:11 -08:00
Lei Jitang
42ee908b3f Merge pull request #19431 from WeiZhang555/19422-default-network 
bugfix: prevent creating network 'default'
 2016-01-19 14:18:20 +08:00
Zhang Wei
31dae442c8 bugfix: prevent creating network 'default' 
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-19 11:06:36 +08:00
Stefan Scherer
4f339570cb Skip failing tests on ARM to get red/green feedback from Jenkins 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2016-01-18 17:00:15 +01:00
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-15 10:03:29 +08:00
Tibor Vass
e35f5a481a Merge pull request #17316 from rmb938/ipam_conf_options 
Add IPAM Config Options to match libnetwork
 2016-01-14 16:30:03 -05:00
Ryan Belgrave
662cac08ef Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-14 14:32:25 -05:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Tibor Vass
349d9700bd Merge pull request #19291 from coolljt0725/fix_19100 
Fix #19100 and fix a typo
 2016-01-14 11:40:29 -05:00
Lei Jitang
3d2539d39d Fix #19100 and fix a typo 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-14 14:58:54 +08:00
Madhu Venugopal
b464f1d78c Forced endpoint cleanup 
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-13 21:28:52 -08:00
Madhu Venugopal
e221b8a3d6 Support --link for user-defined networks 
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
 2016-01-12 07:06:31 -08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
Santhosh Manohar
64a6dc3558 Docker changes for libnetwork vendoring.. 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:55 -08:00
Alessandro Boch
2bb3fc1bc5 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 10:09:16 -08:00
David Calavera
907407d0b2 Modify import paths to point to the new engine-api package. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-06 19:48:59 -05:00
Zhang Wei
26dd026bd7 Add filter for network ls to hide predefined net 
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-12-23 13:26:40 +08:00
Alexander Morozov
812a7c204a Merge pull request #18531 from coolljt0725/update_container_networking_on_create 
fix docker inspect return unconsistent network settings  of created container and stopped container
 2015-12-15 08:47:54 -08:00
Alexander Morozov
260cbb19c9 Merge pull request #18486 from aboch/vnd 
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
 2015-12-14 13:32:01 -08:00
Justas Brazauskas
927b334ebf Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
 2015-12-13 18:04:12 +02:00
Lei Jitang
c427131c94 update network settings on container creating 
To make docker inspect return a consistent result of networksettings
for created container and stopped container, it's bettew to update
the network settings on container creating.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-12-13 02:34:44 -05:00
Alessandro Boch
8fe6b3835c Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-12-09 13:48:24 -08:00
David Calavera
57b6796304 Implement all inspect commands with the new inspector interface. 
It makes the behavior completely consistent across commands.
It adds tests to check that execution stops when an element is not
found.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-09 12:05:01 -05:00
Vincent Demeester
295c27388d Add format flag to network inspect 
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-12-02 22:32:10 +01:00
Vincent Demeester
a600bf4eab Merge pull request #17489 from WeiZhang555/network-rm-multi 
Enhance `docker network rm` to delete multi net
 2015-11-23 08:25:33 +01:00
Zhang Wei
e7eb6687ef Enhance docker network rm to delete multi net 
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-22 05:37:00 +08:00
Stefan Scherer
aef344dcf8 Replace s.d.Start() with s.d.StartWithBusybox() 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2015-11-20 22:16:19 +01:00
Alexander Morozov
a4acb1db4a Merge pull request #17615 from WeiZhang555/17404-net-inspect-name 
Include container names in `network inspect`
 2015-11-13 11:54:59 -08:00
Lei Jitang
451b79d691 Test to verify --mac-address doesn't get applied to new endpoint 
created on network connect.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2015-11-06 14:52:35 -08:00
Santhosh Manohar
dedcf6a6ff Allow port mapping only for endpoint created on docker run 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2015-11-06 13:54:17 -08:00