38bdd65e17
Merge pull request #24002 from crosbymichael/update-containerd-jun27
...
Update containerd to b93a33be39bc4ef0fb00bfcb79147
Upstream-commit: ee658a5aa5565ccdc2adc77c158e817d641f4991
Component: engine
2016-06-27 22:35:38 +02:00
92d47c5a14
Merge pull request #23867 from thaJeztah/fix-install-script
...
Fix installation script for RHEL
Upstream-commit: b01c46e1d8037b7d59c1c7d09afe2d81cec23986
Component: engine
2016-06-27 12:27:56 -07:00
e9a348a21b
Update containerd to b93a33be39bc4ef0fb00bfcb79147
...
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7db7e046315eed5ccfb3a913b965be4b1a595601
Component: engine
2016-06-27 11:45:05 -07:00
bd0a2c513f
Merge pull request #23919 from Microsoft/jjh/prefix
...
Windows: Ensure frozen cope with prefix
Upstream-commit: bf08aae8522001f3358afe82aec52fea0d5d0458
Component: engine
2016-06-23 19:46:55 -07:00
ba17dc4da8
Merge pull request #23824 from mlaventure/fix-apt-repo-components-fields
...
Fix the value of the Components value in apt {In,}Release files
Upstream-commit: 45f76db06d4ac7017147c8ac6925906d41ab4428
Component: engine
2016-06-23 17:54:13 -07:00
f15a4c4a3e
Windows: Ensure frozen cope with prefix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b820ead42674eca25c9718fb4de924405ec0c555
Component: engine
2016-06-23 16:39:16 -07:00
5c41618370
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
Upstream-commit: 18398b2933577d9704e69b0b8312b495e487eeb5
Component: engine
2016-06-23 20:34:02 +02:00
3b1be8edbb
Fix installation script for RHEL
...
the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 73d5f0648e430a74cd05ff9fd335611ddc6dd2a1
Component: engine
2016-06-23 11:17:55 -07:00
ebb89af810
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
Upstream-commit: 138f9538f3a740ef56b1a6cd43ae537a78f4d896
Component: engine
2016-06-22 12:11:00 -07:00
0014a77b9b
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: e26c513fa818a57b4ea572121e153cf6f056e1ee
Component: engine
2016-06-22 09:40:20 -07:00
57899c6630
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 58b8b8fa1555223c1144f08fc4536ffaa4d12fd0
Component: engine
2016-06-22 09:37:17 -07:00
957f0da9b9
Fix the value of the Components value in apt {In,}Release files
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 63b07130140242dffef01ce22d8c85cd7d93ab1a
Component: engine
2016-06-21 12:01:41 -07:00
0251763747
Fixed issue #23787 install script not working for RHEL7 host
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
Upstream-commit: 0e84474672fb30449028b4f7a678d5ab6a81f102
Component: engine
2016-06-21 09:40:00 -04:00
9b9e6d34ec
Revender hcsshim to v0.3.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ee59c53c2f22d17e0dff8b545ffb793cabec9f94
Component: engine
2016-06-20 16:56:13 -07:00
dc5d595545
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
2016-06-18 19:19:13 -07:00
467352d977
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
2016-06-17 19:01:18 -07:00
101ca2b440
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
2016-06-17 10:27:34 -07:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
cfbfd0a0b9
Merge pull request #23570 from vdemeester/change-plugin-install
...
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
2016-06-17 00:12:56 +00:00
2eb1181d59
Merge pull request #23639 from mavenugo/ln-rc2
...
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
2016-06-16 16:17:07 -07:00
8e11dc51d7
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58529a15535ee2accafdde740214c0d5b595d6e1
Component: engine
2016-06-17 00:32:58 +02:00
e47c5a4788
Update swarmkit to 310f1119
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2783568284a0c84bbb53df3c40295d27a151889e
Component: engine
2016-06-16 15:06:27 -07:00
c73117810f
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
...
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54
Component: engine
2016-06-16 14:33:36 -07:00
7b4f900246
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
2016-06-16 14:24:35 -07:00
f500e226f4
Update release script installation instructions
...
Instructions for installing the static binaries
has changed, so updated the instructions.
The comment on top already requires the steps
to be executed as root, so removing the 'sudo'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e233c8dd7208b358b950731a6ba93cf9dcb80eb5
Component: engine
2016-06-16 11:58:29 -07:00
99862c3f0b
Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
...
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Upstream-commit: 9cdb6357e2f8c7561ba580c1e16de81d24e1de99
Component: engine
2016-06-16 05:08:44 +00:00
9bd6973edb
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
4a8d3f13a7
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b675124cf5fc96a6c329b5580ef60304089270c6
Component: engine
2016-06-15 15:11:50 -07:00
6a10bc5376
Update libnetwork to 96d45528599c32354230480a1ebc0
...
This fixes an issue with hanging tests due to store.
Fixes #23560
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e927df7b4b58099113b5086371b1d80ff517f564
Component: engine
2016-06-15 15:07:04 -07:00
a0153fe543
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
2016-06-15 16:18:50 -04:00
abaa81f006
Merge pull request #23538 from anusha-ragunathan/incremental-builds
...
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Upstream-commit: 64eb01caf6490b57163e55588bcf295d9645fdae
Component: engine
2016-06-15 10:53:31 -07:00
efcb8ab316
Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5af8e2a9c08439049da9a9abc24145c3d1f2e9de
Component: engine
2016-06-14 19:50:34 -07:00
241219195c
Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f2f97f768e51f817336cd56456158bc32ab3b977
Component: engine
2016-06-14 19:50:34 -07:00
955da7c9c3
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
2016-06-15 02:33:16 +00:00
50a4204953
Merge pull request #23551 from tonistiigi/update-swarmkit
...
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
2016-06-15 02:25:31 +00:00
d1fb87c721
Update swarmkit to 25572005f
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cdf279d74df05b2ce2a051fc5b53533ac5249f16
Component: engine
2016-06-14 17:07:14 -07:00
cee3d77054
plugins: vendor engine-api to import new plugin types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e5b7d36e9954ffd8c199c0fcfaa0b9f4bfdeb196
Component: engine
2016-06-14 14:20:27 -07:00
d44cc26f44
Vendoring libnetwork 452dff1
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b79122146008e21a01419953bab2d905c94568d
Component: engine
2016-06-14 13:45:24 -07:00
3e617d9868
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 379ec38222541015acabf4001b57475e45f75918
Component: engine
2016-06-14 13:02:54 -07:00
14ac7227ab
Update containerd and runc vendoring
...
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2e9ea5c194e5fbb83f59e30f8bda5467086598fe
Component: engine
2016-06-14 07:47:31 -07:00
0173891ba6
Merge pull request #23361 from docker/swarm
...
Add dependency to docker/swarmkit
Upstream-commit: a1e319e847f41e648ebede7f9d79999d75bd14c8
Component: engine
2016-06-14 00:55:55 -07:00
2a2694e613
Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
...
Do not overwrite already published deb files when releasing
Upstream-commit: 494098534023096f016fa7f184b379929a3f8096
Component: engine
2016-06-13 22:16:53 -07:00
230cf74120
Add dependency to docker/swarmkit
...
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2
Component: engine
2016-06-13 22:16:18 -07:00
711259e403
Merge pull request #23261 from dimrozakis/23260
...
Escape brackets in hack/install.sh
Upstream-commit: f7600fc6413cc7dcc5a243c174ecb086870fb16f
Component: engine
2016-06-13 20:19:26 +02:00
96c1665876
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4d8cc9c0a94840a2d45b549925301daa3bfcad3
Component: engine
2016-06-10 15:27:05 -07:00
44f55e1d1d
Merge pull request #23406 from thaJeztah/update-deb-script
...
release-deb: create "dists" directory if missing
Upstream-commit: a4ff707e993ac01c05eee5dd9e7eb7d374d129cf
Component: engine
2016-06-10 00:05:43 +02:00
7f639864bd
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
Upstream-commit: 30bbf184e937ee2aab075a4a6890d9f9f0b74cde
Component: engine
2016-06-09 11:39:39 -07:00
6ca123dd75
release-deb: create "dists" directory if missing
...
The script failed if an empty volume is used
to generate the repo. This adds the directory
if missing.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 94ac03cdf549567c01f191a066d8435731f41e06
Component: engine
2016-06-09 15:22:49 +02:00
fd09c4f818
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 758f9a8cebbc3f6a0f07cd66146c726452b4207d
Component: engine
2016-06-09 05:48:06 -04:00
7b699065ec
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
Upstream-commit: 456551a672db7285dfdba9927c1acb8d2ab07a6b
Component: engine
2016-06-09 08:14:14 +02:00
