Commit Graph

447 Commits

Author SHA1 Message Date
d8cc018311 Change Docker to use the new HCS RPC API
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 959c1a52bf11dd6b3e65f10bbaa867bfabba6838
Component: engine
2016-05-24 16:36:51 -07:00
ef177628bc Merge pull request #22765 from cyphar/update-boltdb
vendor: bump boltdb to v1.2.1
Upstream-commit: af705ca0ae1af735661ae464cb53d93a890450e7
Component: engine
2016-05-18 06:03:02 -07:00
e6cdd2f8c3 vendor: bump boltdb to v1.2.1
This includes a fix to soft database corruption that would cause Docker
to fail to start if the daemon died in the middle of a transaction
write.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: a7781b130c537ba7c2ea0dde0c47b0d79f1d6629
Component: engine
2016-05-17 16:19:35 +10:00
fe8b5c5d29 Vendoring libnetwork b66c0385f30c6aa27b2957ed1072682c19a0b0b4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1f9e3815aa4ac7eaa707f3a9b436f23c29355a8f
Component: engine
2016-05-16 15:04:01 -07:00
6b362b5e63 Update libnetwork dependencies for b66c038
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ebcf785f2fd81f52f06a0ea83baa4be698605876
Component: engine
2016-05-16 15:04:01 -07:00
f4ab66e327 Merge pull request #22728 from Microsoft/jstarks/improve_import
Windows: reexec during layer import
Upstream-commit: 4c6838137c10e322ce2bd64ce6db0df652e14267
Component: engine
2016-05-16 11:08:05 -07:00
2fd3a4b570 Vendor engine-api to allow docker daemon reload event.
This fix updated the vendored engine-api to version
e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event
type of `DaemonEventType`. The purpose is to allow emitting`
`daemon reload` event as is raised in #22463.

This fix is related to #22463 and #22590.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0f57f47ac39209a7337d0fdcd1217b6f656e971b
Component: engine
2016-05-13 20:39:24 -07:00
e37f7c6e68 Windows: revendor go-winio
This fixes a variety of small bugs in layer handling and adds a new API
for acquiring privileges for the whole process.

Fixes #22404 (but only for new images -- existing images will need to be
re-pushed).

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6d40104f116abdf9740c60846320ce6d36f03edd
Component: engine
2016-05-13 11:53:14 -07:00
687f64e55c Merge pull request #22679 from cyli/bump-notary-version
Bump notary version up to 0.3.0 and re-vendor.
Upstream-commit: c95f1fcbd9d6acc02c9af5fd62d21921b0150cd2
Component: engine
2016-05-12 14:38:07 -07:00
f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
2016-05-11 22:57:51 -07:00
ac0ab24166 Update go-check
It includes a small improvement, we hit test timeout sometimes
for some reason, print out the timed out case would be very
helpful.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ed868a2e119ded10cdc794e2d109210c8a6b0546
Component: engine
2016-05-12 09:19:23 +08:00
958502d650 Merge pull request #22642 from amitkris/uprev_gozfs
update go-zfs to include Solaris support
Upstream-commit: da74f9653dc11c28e0b70267a2882628945051e9
Component: engine
2016-05-11 07:41:17 -07:00
3314e541a1 update go-zfs to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: efb3946171ffa30b716a0614e8037c6b0e699771
Component: engine
2016-05-10 13:51:03 -07:00
820ddc1c92 Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a
This syncs the protobuf version with the one that is used with
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4e290986cdf08a34ad508473bab702793503fa6b
Component: engine
2016-05-09 15:21:41 -07:00
783763f84c Update runc and containerd deps
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfb976438677b15ec023b2ad4822bf1b2f63cc8f
Component: engine
2016-05-09 15:05:44 -07:00
67162abf1a Bump notary version to v0.3.0-RC1
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 88c6675ed2d61dfb56434dd15391f01147abc5e6
Component: engine
2016-05-06 10:59:26 -07:00
b07f1e75d0 Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 97d95604e0f2ac259d60257db0282561e5f52d03
Component: engine
2016-05-05 18:36:09 -04:00
940b2e7c3c Merge pull request #22270 from runcom/too-many-login
distribution: errors: do not retry if too many login attempts
Upstream-commit: 4de672690ce10bf106387bd40d536bc19350345f
Component: engine
2016-05-05 09:44:09 +02:00
6912e449fb vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 305ebfda8bc39b39f018d06a554245872b1ff63a
Component: engine
2016-05-04 18:57:35 +02:00
1db5f40a10 Update engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 988f48164346f5cae713c630d884089958748238
Component: engine
2016-05-02 14:17:40 -04:00
e7d7019314 Vendor engine-api with pull fixes
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ba901bb062d8f1fbc7cc8d9fae5b7365afb66e69
Component: engine
2016-04-30 17:24:25 +02:00
7239ebb0f7 Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
Windows: revendor Azure/go-ansiterm
Upstream-commit: dc98cb534e1ac2375112db56f5c98dd08010c4dc
Component: engine
2016-04-26 08:19:47 +02:00
3500c1d298 Merge pull request #22318 from mrunalp/mount_label_fix
Fix mount label
Upstream-commit: e2c40555f76c0fddff8e17f7930ad90d4cf375b8
Component: engine
2016-04-25 19:54:32 -04:00
db3db29c9f Windows: revendor Azure/go-ansiterm
go-ansiterm was previously pulling the testing package into the docker
binaries.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: fab67ab677e14c908f879e362f8805c8e91570c6
Component: engine
2016-04-25 15:57:59 -07:00
3ee9fe57f8 Update runc and spec dependencies for mount label
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>

Set up the mount label in the spec for a container

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: e0f98c698b49e3790fe63bff611eeda6f5b46055
Component: engine
2016-04-25 14:26:49 -07:00
452a7d0ba9 Adding servicing update to postRunProcessing for Windows containers.
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: da92dad59f76421a22a955d2aed25bfeb4562385
Component: engine
2016-04-25 12:16:26 -07:00
de7c442d63 Bump containerd to v0.2.1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 199472c75a8e0c60108399de2da0247af1a0bdab
Component: engine
2016-04-22 09:39:02 -07:00
2a1aa1222c Update godbus/dbus to v4.0.0
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: 1c967911b979040a6316050b3c00d89e17cb4cb1
Component: engine
2016-04-19 14:51:55 -07:00
f4a20799d2 Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 04bb3a2f45de32794a031f09dbe03fdbba711906
Component: engine
2016-04-19 15:50:20 +02:00
f8a8c81f4e Merge pull request #21657 from vdemeester/update-engine-api
Update engine api with required arguments
Upstream-commit: 7fd53f7c711474791ce4292326e0b1dc7d4d6b0f
Component: engine
2016-04-18 19:47:22 -07:00
0299648cee Vendoring libnetwork v0.8.0-dev.1
- Fixes docker/docker#16964
- Added maximum egress bandwidth qos for Windows

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b1459f1b94ee94240793f769a04354705e889104
Component: engine
2016-04-17 11:17:48 -07:00
e5d5e1b581 Vendor engine-api with required arguments
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9802d7d10f0cfbd74bc129c01f96e183b9743766
Component: engine
2016-04-15 10:11:05 +02:00
7a5c745f9d Merge pull request #21949 from aaronlehmann/vendor-distribution-1622
Vendor distribution to correct config blob media type in schema2 manifest
Upstream-commit: 40502e381371763ea0942b7d6511f5c98b65bc1e
Component: engine
2016-04-12 21:23:22 -04:00
60b2b4b1f7 Vendor distribution to correct config blob media type in schema2 manifest
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in https://github.com/docker/distribution/pull/1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c18d03a7783bb78b7568bf3c23644888995e9a5d
Component: engine
2016-04-11 17:29:17 -07:00
03c94efb60 Windows: Revendor Microsoft/hcsshim
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 15b0f06a9ad6778deeb9560c2f353e29d4f795da
Component: engine
2016-04-11 13:23:38 -07:00
f43c0844fa Vendor Libnetwork v0.7.0-rc.6
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 6dd2c3321793c3fe60abb94b88018e4b096f12c7
Component: engine
2016-04-09 10:45:13 -07:00
91f3e13e7c Windows: revendor Microsoft/go-winio and Microsoft/hcsshim
These changes add support for importing base layers and change the tar
metadata for Windows layers to better match the intent of the tar format.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 9b486999f280c1a5a283a0bbe80ae0991e82ced7
Component: engine
2016-04-07 17:52:27 -07:00
303525ea6c Merge pull request #21810 from aboch/vnd
Vendoring libnetwork v0.7.0-rc.4
Upstream-commit: d82e522e36a6d1ce89185bcddd05511c0a074eed
Component: engine
2016-04-06 14:18:33 -07:00
5da6bec3ad Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
Client print error when specify wrong detach keys
Upstream-commit: 5709f8e4227e0e1da333739c44003a3f47279bd5
Component: engine
2016-04-06 22:14:14 +02:00
f0315af665 Vendoring libnetwork v0.7.0-rc.4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8a957bafa58e2eed8f31722c7fcc3709ca509a29
Component: engine
2016-04-06 12:18:21 -07:00
e6a7fb2bb7 Merge pull request #21780 from sanimej/libn-v0.7rc2
Vendor Libnetwork v0.7.0-rc.3
Upstream-commit: a79e79c58e7da0ab8519e708271f0e45a341c3d2
Component: engine
2016-04-06 13:54:21 -04:00
219d5e639e Vendor Libnetwork v0.7.0-rc.3
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 5b892819a60a0a91c168c6a2c1e22c958be143ca
Component: engine
2016-04-05 22:01:19 -07:00
ac4137daba Define readonly/mask paths in spec
This vendors in new spec/runc that supports
setting readonly and masked paths in the 
configuration. Using this allows us to make an
exception for `—-privileged`.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
8fbc569d31 vendor engine-api 8924d6900370b4c7e7984b
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: e1a4332c13d0bdc5e960102a4f0dfd8e1fb6ffaf
Component: engine
2016-04-04 15:32:26 +08:00
087b91dfb7 Merge pull request #21679 from tonistiigi/no-pivot-root
Bring back support for DOCKER_RAMDISK
Upstream-commit: 00031c15b5b2226292eb9575bc3b390bdcd83a56
Component: engine
2016-03-31 12:40:57 -07:00
1917da0dad Bring back support for DOCKER_RAMDISK
Fixes #21631

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8a4225cd5ad3ad56a7e896f675080c0ed38982a3
Component: engine
2016-03-31 10:29:32 -07:00
09b74b88c4 Merge pull request #21665 from cyphar/bump-runc
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
Upstream-commit: 60821fe288ce1c53fdf5ab553b9f1d4571f1ec11
Component: engine
2016-03-31 11:38:57 +02:00
e7c442dff1 Vendor Libnetwork v0.7.0-rc.1
- Fixes https://github.com/docker/libnetwork/issues/1051
- Fixes https://github.com/docker/libnetwork/issues/985
- Fixes https://github.com/docker/libnetwork/issues/945
- Log time taken to set sandbox key
- Limit number of concurrent DNS queries

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 90bb5301b51ec6a6c77b910855441feef10492ff
Component: engine
2016-03-30 18:12:23 -07:00
b856d3bee3 vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
Also modify an integration test that hardcoded the error string so it
uses the exported error variable from libcontainer/user.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: da38ac6c79fe902ed0687afc73d731c95c6d491a
Component: engine
2016-03-31 11:20:38 +11:00
0610ad67ff Merge pull request #21593 from aboch/bdvnd
Vendoring boltb/bolt v1.2.0
Upstream-commit: 0fa96f246312661416bd8ea5010dc1a77a769323
Component: engine
2016-03-29 11:29:30 -07:00