88d33e25a1
Merge pull request #19503 from jfrazelle/update-logrus
...
bump logrus
Upstream-commit: 7bddbdf360f50fed07cd21b21270f5f287222d8c
Component: engine
2016-01-20 12:54:49 -08:00
aaa9f64061
Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
...
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
Upstream-commit: bcf155bb7a3cacf8f37e98d41c136eeba3f7775e
Component: engine
2016-01-20 11:31:14 -08:00
d7e4961a40
bump logrus
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 95695aa38caafa6f4cf42f90c2e0fa67c5e36b91
Component: engine
2016-01-20 09:51:09 -08:00
2bc66fc26e
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
Upstream-commit: 87b7ff52675119aa0ddfdfa789ad5fbf9fdd99b0
Component: engine
2016-01-20 09:02:21 +01:00
7331395789
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
...
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
2016-01-19 15:34:08 -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
28d6652c84
Vendor updated docker/distribution package
...
Fixes #19400
Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b
Component: engine
2016-01-19 13:28:51 -08:00
1df5742548
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
...
- Fixes the issue of Shutdown() not working, resulting in hung
goroutines
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: bccf653082dababc1827be3aa9976e3100037a80
Component: engine
2016-01-17 08:17:13 -08:00
6e02d0f3a0
Merge pull request #19355 from riyazdf/notary-revendor
...
notary revendor into docker
Upstream-commit: 4c89b1f72c1259858e243ddbfb00d74dbafeff8a
Component: engine
2016-01-15 01:02:35 -08:00
9952183b81
revendor notary and wrap friendlier error messages
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: dd7436c832a5dd777d0276c3e3b1819062b86ebc
Component: engine
2016-01-14 20:35:59 -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
25aab1428e
Merge pull request #18587 from calavera/daemon_configuration_file
...
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
2016-01-14 16:44:58 -08:00
c8a4568d47
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
2016-01-14 18:50:53 -05:00
bcd131a7aa
Changes cross-repository blob mounting to a blob Create option
...
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata
Signed-off-by: Brian Bland <brian.bland@docker.com >
Upstream-commit: 63099477189ea14f3122f6aa37fa7c60d33562c7
Component: engine
2016-01-14 14:26:03 -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
d9690fd0d0
Vendor merge structure tool.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1666707cf895e9de63aedaf744ae4923c41f73d2
Component: engine
2016-01-14 11:58:38 -05:00
680642b7a4
Vendor engine-api 0.2.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7a5d8974109ec34e9fb752b2935077eb8da7a229
Component: engine
2016-01-13 20:09:47 -05:00
7afe53c8eb
Adds cross-repository blob pushing behavior
...
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.
Signed-off-by: Brian Bland <brian.bland@docker.com >
Upstream-commit: 7289c7218e2101eb94fb90f2cb22e1412d016984
Component: engine
2016-01-13 14:26:30 -08:00
296f98f18e
Merge pull request #19267 from mavenugo/vin-ln
...
Vendor libnetwork v0.5.4
Upstream-commit: 46eb4700391e8462756000d584337a763bc563c6
Component: engine
2016-01-13 07:09:58 -05: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
fb652937c3
read seccomp profile locally then pass to daemon
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 062d0b3921316bc348c7930ce6599e1f8f297090
Component: engine
2016-01-12 13:12:29 -08:00
98712ec16b
Vendor engine-api 0.2.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ca60e6262bc33ce213e40bdebe9e64c4fb00974a
Component: engine
2016-01-12 13:19:16 -05:00
e46c089f56
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
2016-01-11 17:21:38 -08:00
46b5818462
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
Upstream-commit: f11b6a2ab313a03d051dd6f69d264d0482df72d6
Component: engine
2016-01-11 12:01:46 -08:00
7e3ab3dcd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
2016-01-10 11:46:34 -08:00
75cd536d3d
Vendor updated github.com/docker/distribution
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 290ba41c00488b8c4ac2e5488bc1b040b758df75
Component: engine
2016-01-08 17:24:20 -08:00
03dfb7ff42
Re-vendoring notary in order to deal with a canonical JSON serialization issue.
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -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
783f31c7b2
Merge pull request #19001 from aboch/pip
...
Allow user to choose the IP address for the container
Upstream-commit: 05de2aadff97be0ffe8a3ed0cf4ac363d291488f
Component: engine
2016-01-08 11:49:20 -08:00
61116ea963
Merge pull request #18887 from riyazdf/notary-delegations
...
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
2016-01-08 10:37:55 -08:00
219c1dc7e6
Vendor new syslog library with TLS support.
...
The syslog package in the stdlib is not maintained anymore.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 145f020122681d4868f717d64dfa556db22ac83d
Component: engine
2016-01-08 12:35:35 -05: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
1ce594cbcd
update tests and error messages, revendor notary with tag
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
b741751f8d
Notary delegation integration into docker
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
14985d55be
Vendor engine-api 0.1.3.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00
e49de6ef58
Vendor engine-api project.
...
Use latest tag for both, engine-api and go-connections.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9927e712c0c5a04c2d802e160e27d3c16c650cf2
Component: engine
2016-01-06 19:46:06 -05:00
4da63ae80d
update runc to the latest code base to fix gccgo build
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 998263170750ee5504bc4fe23f9a3d1f797e2a41
Component: engine
2016-01-06 00:02:56 +00:00
3dd9453e30
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
889a0e3758
Upgrade go-units vendor to latest version with ulimits.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3b8301b6600855e348bf4eeacabe5059f52e9d99
Component: engine
2015-12-23 13:27:58 -05:00
85924c9d77
Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c
Component: engine
2015-12-22 18:59:47 -05: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
d6be4062df
Vendor new connections library.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d
Component: engine
2015-12-22 13:31:46 -05:00
5fc03c3956
Merge pull request #18719 from jfrazelle/vendor-updates
...
update and run vendor script
Upstream-commit: f8140332c0ea83a0821550452ed0aa26e2df3b3b
Component: engine
2015-12-16 11:27:02 -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
0e29e152da
Vendor go-units and libcontainer.
...
Libcontainer depends on the new package now to avoid cycled
dependencies.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0609342d04e3e5fbcf17f36c5affef5073643636
Component: engine
2015-12-16 12:25:54 -05:00
19f8a4f8fb
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
fbb93e6251
Update runc/libcontainer to v0.0.6
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: e8f7d5885dad5364b25a8f1efa8bb6b29afa89b1
Component: engine
2015-12-11 15:24:32 -05: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
ab6c9709f6
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
58deeedf40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00