Commit Graph

76 Commits

Author SHA1 Message Date
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
94bf0c258a Remove vagrant files from vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 46da04388f144579a638aeb09ec5c10c800120d0
Component: engine
2016-03-16 20:30:47 -07:00
d0536df380 Vendoring libnetwork v0.7.0-dev.8
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 62232919650438a6ae2b18714b4fe223d34277f5
Component: engine
2016-03-16 13:45:34 -07:00
f943c3b499 Vendor libnetwork v0.7.0-dev.7
* Experimental support for macvlan and ipvlan drivers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9047cd40c2b2eb0609132800b9b8752d1cad0fcc
Component: engine
2016-03-11 14:22:25 -08: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
5ad396f39a Vendoring libnetwork v0.7.0-dev.3
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 196b27211b77562cd6d5d620d4dd5bfe473383ed
Component: engine
2016-02-17 17:07:33 -08:00
663fe6f381 Vendor libnetwork v0.7.0-dev.2
- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b2e609176d1233eb845785dfdd72b4b747171178
Component: engine
2016-02-11 07:09:53 -08:00
878a07f809 Vendor libnetwork v0.6.1-rc2
- Fixes #20132 #20140 #20019

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 84705f15d9b0226fa005cada11cad2ad5aad5179
Component: engine
2016-02-09 21:46:50 -08:00
289b56d094 Vendor libnetwork v0.6.1-rc1
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2da61086ea0f7d06108f1ec4ba082f74d2c1c671
Component: engine
2016-02-05 18:20:22 -08:00
bd6ac00111 Vendoring libnetwork 0.6.0-rc7
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b80f761b141cf88c506f40b3e439cbe7a011c5d9
Component: engine
2016-02-01 14:52:18 -08:00
1fc2a011dc Vendoring libnetwork 0.6.0-rc6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f943fd7d2427fbf893b9e0795528500fc99081b8
Component: engine
2016-01-30 20:03:03 -08:00
bed434b1dc Vendoring libnetwork v0.6.0-rc5
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 730a6d2fc22f9efdb18a79b39935f1438a5e5f84
Component: engine
2016-01-26 11:44:43 -08:00
36c72742b4 Vendor libnetwork v0.6.0-rc4
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7029d9e6ad766492c2619084c13a8ef88167eddf
Component: engine
2016-01-25 19:51:21 -08:00
bd05e8f1c1 Vendor libnetwork v0.6.0-rc3
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6ac9a2f410ad506204faf8f22fc502dc780e3986
Component: engine
2016-01-25 13:22:47 -08:00
0704f515fb Vendor in libnetwork v0.6.0-rc2
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 02c9d48144c0523d59fe4ba1c0b645c17fd05f80
Component: engine
2016-01-21 20:46:28 -08:00
795bea682d Vendor libnetwork v0.6.0-rc1
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ee3b42f385cdb41b2996b4b64f4f319adb62ad03
Component: engine
2016-01-19 13:50:17 -08:00
a534cbd465 Vendoring libnetwork v0.5.6
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 5347f7cd947df3e29d777274c9325c9461a1c051
Component: engine
2016-01-14 10:48:48 -08:00
b8b2e1e984 Vendoring libnetwork v0.5.5
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4e4ba9dd3a1d488cf9d808f35904ce59911a55de
Component: engine
2016-01-14 10:34:00 -08:00
fb043c8580 Vendor libnetwork v0.5.4
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 537089481fd9f6859d851a76b67a4f80e0e3691e
Component: engine
2016-01-12 20:42:30 -08:00
d53ca527b3 Vendoring libnetwork and its dependencies..
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc
Component: engine
2016-01-08 14:13:21 -08:00
f1d228a431 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
2016-01-08 09:19:31 -08:00
663db95ac5 libnetwork vendoring
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
a9f65cbbd3 update and run vendor script
so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a016ec6fd168016d94d6cfd1e2189f8c25f6de1f
Component: engine
2015-12-16 09:58:20 -08:00
3bcd3dfc58 Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8fe6b3835c87abf0c48d60f9c1f70bdcb496566c
Component: engine
2015-12-09 13:48:24 -08:00
c93754a0f9 vendor: bump deps
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
2015-11-26 16:29:59 +01:00
cc6e53230d Fixed an endpoint delete issue with a possible stale sbox
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea
Component: engine
2015-11-19 12:46:37 -08:00
789bc1f38f Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
62ba8c349b Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
- To bring in ip-range fix

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 9c395537bce1e787ae34d90b2de81df3a47c5ff9
Component: engine
2015-11-09 15:29:54 -08:00
bafe2d42bf Fix a corner case issue when daemon panics
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 79cffa5ce4a71b29eed66e26c1fb7f153be5c045
Component: engine
2015-11-02 18:37:35 -08:00
106476f022 Vendoring libnetwork
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 10e1b9f02ee633349bc45631dac18cb4cc5baa61
Component: engine
2015-11-02 08:33:52 -08:00
cc98d1ba33 Vendoring in libnetwork to fix an ungraceful restart case
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2361edbcea22113aea639a3d74edb35791fd8aef
Component: engine
2015-10-30 16:24:02 -07:00
8c783d1695 Vendoring libnetwork to solve an ungraceful restart condition
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ebf76171f6d63938558cdd5bef33565b48d664b7
Component: engine
2015-10-29 18:56:17 -07:00
4a8db513f4 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
1c1efd72ec Vendor in libnetwork changes to support container rename
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 1041f3967086052438a3e34cee3db14e2277b629
Component: engine
2015-10-23 16:27:03 -07:00
0759578039 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 139d1e13e29ed987face1494471fdb6c986d6c4a
Component: engine
2015-10-26 13:56:56 -07:00
58a78457b3 Vendoring in Libnetwork
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 52df87ac2b83693a48efcdc7167575449f122e25
Component: engine
2015-10-22 14:12:46 -07:00
2bfb10b6f8 Vendoring in libnetwork for the anonymous endpoint
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
82f86233a6 Vendoring in libnetwork to fix daemon bootup instabilities
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
f3edec8c49 Vendoring libnetwork
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
b9ef35ce38 Vendoring libnetwork to Replace the label variable to DriverOpts
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e
Component: engine
2015-10-16 14:30:57 -07:00
22d67b7818 Bump to latest libkv/libnetwork + dependencies
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 7078e7ddf42ad0beeb61e82cb1544d74def98adf
Component: engine
2015-10-13 14:41:43 -07:00
b5732f7da4 Vendoring in libnetwork ipam support
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2e3113aeef08c9e7fa4f9cb0fd3d53185d492b99
Component: engine
2015-10-13 10:52:49 -07:00
45997573a5 Network UX and integration tests
* Exiting experimental network UX
* removed experimental service UX
* integrated with the new network remote API

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22a9ba090eb3cc1bc6c851785a876b064df7341a
Component: engine
2015-10-07 03:54:27 -07:00
8623fdfb48 Network remote APIs using new router, --net=<user-defined-network> changes
* Moving Network Remote APIs out of experimental
* --net can now accept user created networks using network drivers/plugins
* Removed the experimental services concept and --default-network option
* Neccessary backend changes to accomodate multiple networks per container
* Integration Tests

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ab94e11a2a8499088a72ab27fd09e897d8c810a
Component: engine
2015-10-07 03:54:19 -07:00
d0c8047b82 Vendoring in libnetwork integrated with Docker Discovery
This commit brings in end to end integration of Docker Discovery with
libnetwork multi-host networking.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 956fbccdaa52e3dedac53b039671de1fd7f54d02
Component: engine
2015-10-02 13:07:44 -07:00
602b65fbb2 Vendoring in libnetwork with the fix for compilation error using GCCGo (X86 GCCGO CI)
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: ba4c132491b913d050c3fdf72f623b59f3dbb563
Component: engine
2015-09-26 01:37:56 +00:00
f7f326c894 Vendoring libnetwork and libkv
- Libnetwork brings in :
  * Default Gateway as a service for network drivers
  * Persistence for local scoped networks using libkv
  * BATS based Multi-host Integration-test infra and end-to-end tests
  * libnetwork fixes for zookeeper and etcd backend
- Libkv upgrade brings in :
  * boltdb support for local kv persistence
  * other general bug fixes

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 59a000ec7fc31ef4dedc526ef77e70af24f39585
Component: engine
2015-09-25 10:02:31 -07:00
7583ab4278 Vendoring libnetwork
Pull in version e5fea92a6c8a5968bdb8005bf959c6e23113b689

Fixes libnetwork regressions that stopped drivers that set routes from working.
Pulls in libnetwork PRs #546 #543

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
Upstream-commit: 499ade011685732728c9fd1ee2d7d5fe4a9a6a76
Component: engine
2015-09-21 11:13:14 -07:00
dbdbf2ae59 Vendoring libnetwork
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: a803148bbac87aec183be38502991bb779196560
Component: engine
2015-09-16 14:48:42 -07:00
7ff16017f2 Vendoring in libnetwork and libkv
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
  (Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 814c19591d875a747433f87ae84dffbf58c4d21a
Component: engine
2015-09-16 11:54:28 -07:00