676dd1beed
Fix Docker core dumps when removing network with special characters ( #21401 ).
...
This fix tries to fix Docker core dumps when removing network with special
characters. The issue is from the fact that when docker client tries to
pass the command to API, the networkID is not escaped in case of special
characters. This also means other commands (not just `docker network rm`)
may face the same issue (e.g., `docker network connect`).
This fix adds the URL path escape to properly handle it. In addition, an
integration test for network create and delete is added to cover the cases
in #21401 .
This fix fixes #21401 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
(cherry picked from commit f8dc5562d0a74792c46b9382181ddf97e5d7cdac)
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f1542276081aa91396495059638d3ea30d4e5a10
Component: engine
2016-03-23 15:07:14 -04:00
26e4c9db49
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: fbdb3c3a4b15720c0df3a59d4bef0773b365c2b1
Component: engine
2016-03-22 12:36:21 -07:00
fe56b4ef22
add label support for build, networks and volumes
...
build: implement --label
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
network: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
volume: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
add tests for build, network, volume
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
vendor: libnetwork and engine-api bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: fc214b4408d915e3510f61c7584ca01c176d1373
Component: engine
2016-03-22 11:49:06 -04:00
d91c7046be
Vendoring libnetwork v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5a654089416762da484ca9929fcd216076b591ab
Component: engine
2016-03-08 18:47:02 -08:00
a0833fa844
Merge pull request #20995 from wenchma/ping_timeout
...
Update ping command timeout to 4 sec
Upstream-commit: 6d6919ed79083b3339889911853589a6502afc5c
Component: engine
2016-03-08 15:35:00 -05:00
8912d208d9
Update ping command timeout to 4 sec
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: c7a340e2be351e24c3be7aba8fa2032fa6f01e52
Component: engine
2016-03-08 15:06:58 +08:00
a41eec344b
Merge pull request #20852 from wenchma/net-alias
...
Add tests of unsupported network-scoped alias on default networks
Upstream-commit: 5ded3a212b16087f836622e7dbfb584944e6e145
Component: engine
2016-03-07 13:37:12 -05:00
c06c593d4a
Enhancement of TestDockerNetworkInternalMode
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 312e20bf6ce7bb396cbc9d05114a66b41f23e3ab
Component: engine
2016-03-04 10:56:10 +08:00
a2c76ae251
Add tests of unsupported network-scoped alias on default networks
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 0515d9b9c0cbfa9d10b98c58f428f599174e961e
Component: engine
2016-03-02 16:57:50 +08:00
f04054d6f5
Fix typo
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 8474bbff4594f382dbac5ad59767d18b2d8f2689
Component: engine
2016-02-23 17:27:55 +08:00
34184bd076
Merge pull request #20383 from HackToday/addsort
...
Make network ls output order
Upstream-commit: 0e72550c5b27704ac1ec043302fe2aaebe3b1956
Component: engine
2016-02-19 15:42:48 -05:00
d9c028ed66
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
d9d773f20a
IT case for sending invalid query to embedded DNS server
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: e5293f97f240c194eba1a46e5883514c9ccb4586
Component: engine
2016-02-18 12:14:19 -08:00
7d665cca4e
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
f8aea9f057
Make network ls output order
...
Fixes : #20328
We sort network ls output with incresing order,
it may make output more easy to consume for users.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 838ed1866bf285759efdc01a97ae837f0f1c326a
Component: engine
2016-02-17 04:35:36 +00:00
cacd57e1c5
Merge pull request #20261 from tophj-ibm/change-test-to-use-variable
...
Change integration test to use declared variable
Upstream-commit: fffff202fcc3dc63f72ce883d728eb5149e9f1ce
Component: engine
2016-02-12 07:52:51 -08:00
f115ec243c
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 >
Upstream-commit: ce1059973a4a46acc272a8c0fea521c96e628ba7
Component: engine
2016-02-11 21:20:00 -05:00
992182031d
Merge pull request #20250 from vieux/fix_misspell
...
fix common misspells
Upstream-commit: 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7
Component: engine
2016-02-11 17:22:06 -08:00
697a990701
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
cfb6f193ab
Expose bridge IPv6 setting to docker network inspect
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: dfb00652aa801ecd7fcc3bf492434bd140d9d1ea
Component: engine
2016-02-11 22:13:47 +00:00
6d38af4937
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 >
Upstream-commit: 045aee2002e76cbfc9999472fe6e8fc54e0c0085
Component: engine
2016-02-11 16:47:40 -05:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
9044b5c3c7
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
8ebdd00a4c
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 76a765140e831bdd5b7139b86db001ec6872023a
Component: engine
2016-02-03 14:44:55 -08:00
2b5317f067
Store endpoint config on network connect to a stopped container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 9b63e4e7f5a02efa89d8bc91e1cb5e4cada60093
Component: engine
2016-02-02 17:25:44 -08:00
ed5a9b6268
Add integration test for network host bind option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 4f1d876e4c6907154e0dbb52fcc1ecc2643c6915
Component: engine
2016-02-02 18:01:04 +08:00
8bc92ae008
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 >
Upstream-commit: 62a856e9129c9d5cf7db9ea6322c9073d68e3ea4
Component: engine
2016-01-29 23:39:07 +08:00
fa73e1295e
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 >
Upstream-commit: 7126ecd0ad1f6188540949cbdbca20f4a75d1839
Component: engine
2016-01-26 15:13:26 +00:00
6f75e7937c
Save endpoint config only if endpoint creation succeeds
...
- Currently it is being save upfront...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 733245b2e7517b88cdfb188f9d8418f29bca6338
Component: engine
2016-01-25 13:43:32 -08:00
0fc7347e16
Merge pull request #19527 from aboch/epc
...
Move Unsupp Network & IP check to the new updateNetworkConfig() func
Upstream-commit: 422827fa92f9fc888271d02874ab950797ab16cb
Component: engine
2016-01-22 15:54:21 -08:00
4f27e3ae36
IT for service/network name with '.', corrected libnetwork flag for DNS
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: da9eadb06669b7d2b375424a31991cf97de19900
Component: engine
2016-01-21 20:49:02 -08:00
d88278ac45
Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 3b0d36dbc16d820c08ff1a2793eda2ef7048547d
Component: engine
2016-01-21 10:56:01 -08:00
8768e5ebb2
Fixes the typo of docker_cli_network_unix_test.go
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 2e6b1eb309fa98035458b993ef83736ed671b77c
Component: engine
2016-01-21 16:37:17 +08:00
8e77159989
IT for remote network driver & ungraceful restart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8799218d01785aa056c2f1f06f3735c3e93496b4
Component: engine
2016-01-19 14:09:11 -08:00
99e8dc11f9
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
Upstream-commit: 42ee908b3faa231322052c27d9ec8ffebc1c40eb
Component: engine
2016-01-19 14:18:20 +08:00
187ffe612a
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 >
Upstream-commit: 31dae442c8a640694209c7451d6e9bf644aa2743
Component: engine
2016-01-19 11:06:36 +08:00
d22cc489e9
Skip failing tests on ARM to get red/green feedback from Jenkins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 4f339570cbd3cc57f5410c4ca08c7d7e03e6e56f
Component: engine
2016-01-18 17:00:15 +01:00
819b85bb3a
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 >
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
2016-01-15 10:03:29 +08:00
57bedb0b2d
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
2016-01-14 16:30:03 -05:00
f8714c52f0
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com >
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
2016-01-14 14:32:25 -05:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
cfd7c2432a
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
Upstream-commit: 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1
Component: engine
2016-01-14 11:40:29 -05:00
e5509a078a
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b
Component: engine
2016-01-14 14:58:54 +08:00
2b7ea75ef2
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 >
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
6c7b14647b
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 >
Upstream-commit: e221b8a3d64c13178e156fc3ece5e9894dac1603
Component: engine
2016-01-12 13:38:48 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
d8dc8b7d33
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
7467c1af44
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
4ec2693c9e
Modify import paths to point to the new engine-api package.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
2016-01-06 19:48:59 -05:00
Yong Tang
Alessandro Boch
Evan Hazlett
Brian Goff
Wen Cheng Ma
Arnaud Porterie
Santhosh Manohar
David Calavera
Kai Qiang Wu(Kennan)
Morgan Bauer
Christopher Jones
Victor Vieux
Aidan Hobson Sayers
Chun Chen
Tibor Vass
Madhu Venugopal
Zhang Wei
Bryan Boreham
Lei Jitang
Stefan Scherer
Ryan Belgrave
Sebastiaan van Stijn