0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
33984 commits 14 branches 412 tags 338 MiB
Commit graph

152 commits

Author SHA1 Message Date
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
Lei Jitang
a2d8c93fc6 Prevent connecting to host and prevent disconnecting from host 
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-11-09 10:19:53 +08:00
Zhang Wei
fbed26297d Include container names in network inspect 
This commit makes `docker network inspect` print container names as
service discovery is based on container name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-05 19:16:13 +08:00
Doug Davis
c90125dc8a Merge pull request #17637 from aaronlehmann/network-test-name-typo 
Fix typo in name of integration test TestInspectApiMultipeNetworks
 2015-11-02 20:42:36 -05:00
Aaron Lehmann
701e5dfe8a Fix typo in name of integration test TestInspectApiMultipeNetworks 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-11-02 17:30:16 -08:00
Madhu Venugopal
b323e3df8b IT for ungraceful daemon restart with multiple host-mode containers 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-11-02 14:00:11 -08:00
Alessandro Boch
45e71a7984 Fix bug in initializeNetwork() 
- On `docker run --net <network id> ...`
  the bug would cause the container to attempt
  to connect to the network two times
- Also made sure endpoint creation rollback will
  be executed on failures in `func (container *Container) connectToNetwork()`

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-11-02 11:20:15 -08:00
Alessandro Boch
e16e794805 IT for daemon restarts when container connected to multiple networks 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-30 16:25:25 -07:00
David Calavera
f301c5765a Fix network inspect for default networks. 
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-30 16:55:21 -04:00
Vincent Demeester
05534b6f80 Merge pull request #17518 from WeiZhang555/integration-test-bug 
bug fix for test cases
 2015-10-30 16:56:35 +01:00
Zhang Wei
8f53edae3b bug fix for test cases 
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-10-30 15:13:35 +08:00
David Calavera
2eaa25d355 Merge pull request #17499 from jfrazelle/fix-lxc-tests 
lxc does not support exec
 2015-10-29 15:08:13 -07:00
Jessica Frazelle
aaa134ea0e
lxc does not support exec 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-29 11:51:59 -07:00
Alessandro Boch
e03daebb48 Execute buildPortMapInfo after Endpoint.Join() 
- As the retrieved info may not be available at
  Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-29 11:47:30 -07:00
Lei Jitang
1b9a08e719 Fix docker inspect container only reports last assigned information 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-10-27 16:26:06 -04:00
Alessandro Boch
4f6f00e191 Do not update etc/hosts for every container 
- Only user named containers will be published into
  other containers' etc/hosts file.
- Also block linking to containers which are not
  connected to the default network

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-26 20:08:57 -07:00
Alessandro Boch
be1c77595e Disable built-in SD on docker0 network 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-23 19:46:28 -07:00
David Calavera
2afdc6582b Merge pull request #17274 from aboch/ai 
Turn off discovery when icc == false
 2015-10-22 13:08:31 -07:00
Alessandro Boch
20faaaa872 Turn off service discovery when icc==false 
- Turn off built-in service discovery on docker0 bridge
  when icc is false

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-22 12:02:02 -07:00
Sebastiaan van Stijn
9f031f70ce Merge pull request #17218 from vdemeester/17023-network-multiple-inspect 
Add support for multiple network in inspect
 2015-10-21 11:09:02 -07:00
Vincent Demeester
7af9f988ac Add support for multiple network in inspect 
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.

`docker network inspect host bridge none` is possible now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-21 08:57:29 +02:00
Alessandro Boch
27f908a051 Do not mask ipam driver if no ip config is passed 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-20 11:19:37 -07:00
Madhu Venugopal
6f3eb994b5 Pass network driver option in docker network command 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-16 14:33:54 -07:00
Brian Goff
835fbee9a2 Merge pull request #17053 from liaoqingwei/dev2 
use of checkers on docker_cli_network_unix_test.go
 2015-10-16 09:36:59 -04:00
liaoqingwei
9e3db08363 Use of checkers on docker_cli_network_unix_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-16 16:56:40 +08:00