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
d286ab94c3
vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2
Component: engine
2015-12-03 13:36:31 -08:00
d4bbe1cfa0
vendor: update tar-split to v0.9.11
...
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 919104e6bb19b2e815236ee5cffa919c373f85e2
Component: engine
2015-12-02 15:34:12 -05: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
d55f3e0dd1
revert README changes in vendored files
...
PR https://github.com/docker/docker/pull/17986
inadvertently included changes to some vendored files.
This reverts those changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2
Component: engine
2015-11-25 16:07:43 +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
2052e6ad6a
Fix small typos in documentation files
...
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com >
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
2b045a190b
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
Upstream-commit: 7a6f2cdeeb88f340649a459697f79548759767dd
Component: engine
2015-11-14 12:03:29 +01:00
0179308537
Merge pull request #17211 from endocode/kayrus/docker_fd_https
...
Added possibility to use TLS with systemd socket activation
Upstream-commit: dc136b710b70a51510726576761f7bf9aa2455e2
Component: engine
2015-11-14 08:36:54 +01:00
e326b386f5
update notary vendors
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: a52a7a6991427f7f1db63755bf5a1cc09b105bd5
Component: engine
2015-11-13 13:19:09 -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
320a0d9081
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05: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
7eead35e44
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
2015-11-09 10:03:25 -08:00
97dac59e9f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b09a452c1f89e84b513ed7eaf567437291e0e50d
Component: engine
2015-11-05 19:59:28 +01:00
c1c1eb239a
Updated vendor go-systemd with enabled TLS activation
...
Signed-off-by: kayrus <kay.diam@gmail.com >
Upstream-commit: 0a6acbede31702f541c6caf801e6f5421bfed989
Component: engine
2015-11-03 11:02:05 +01: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
e8b4f63208
Merge pull request #17557 from aaronlehmann/update-distribution
...
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
bf1b372cbc
Vendor updated version of docker/distribution
...
This updates the vendored docker/distribution to the current master
branch.
Note the following changes:
- The manifest package was split into manifest/schema1. Most references
to the manifest package in the engine needed to be updated to use
schema1 instead.
- Validation functions in api/v2 were replaced by the
distribution/reference package. The engine code has been updated to
use the reference package for validation where necessary. A future PR
will change the engine to use the types defined in
distribution/reference more comprehensively.
- The reference package explicitly allows double _ characters in
repository names. registry_test.go was updated for this.
- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
that the schema1 package unmarshals the correct payload. The test is
being changed to modify the JSON without affecting its length, which
allows the pull to succeed to the point where digest validation
happens.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
88f746d118
Merge pull request #17619 from jfrazelle/canonical-update
...
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
9601e97681
rebased canonical/json off go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -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
d73613b841
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
9514b66cfb
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04: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
f8757c11b0
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -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
ff53341015
Bump bolt to v1.1.0
...
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
2e7de41d92
Update vendored aws-sdk-go
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: 70083e6fc3a7f64755fcf4752e6d24758bdd0543
Component: engine
2015-10-27 23:43:51 +00: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
7c4b8bccf9
Merge pull request #17381 from mavenugo/rc3v1
...
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
2015-10-26 17:06:01 -07:00
b67a8a66b5
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
2015-10-26 16:47:51 -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
878c53917a
Windows [TP4] HCSShim Revendor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3c43964cf994cc1315af1590155f63dc588e32c
Component: engine
2015-10-23 08:41:30 -07:00
c31c8acf2e
Vendoring in libkv to be aligned with libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 793b20ba093acedfb53ea2a3344601322e97893f
Component: engine
2015-10-22 14:12:46 -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
