Commit Graph

147 Commits

Author SHA1 Message Date
392ffd1e6e Merge pull request #31705 from cyli/bump-go-connections
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: afe1c5c2ebbe2d5448668761f722b0f5d2def9a5
Component: engine
2017-03-21 10:36:41 -07:00
7ea495470a Windows: Fix Docker hanging with named pipes and stdin
Fixes #31922

Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43)
merged


Signed-off-by: David Gageot <david@gageot.net>
Upstream-commit: 97b572ea1ba05fadbae5e29335489a04b5b3b123
Component: engine
2017-03-21 11:49:57 +01:00
95794e3edc Merge pull request #31710 from sanimej/drillerrr
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
080e3bfe01 Update docker-credential-helpers to v0.5.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9dec486cf6d8e85bb5737b75e8520bb9433ec043
Component: engine
2017-03-13 21:08:41 +01:00
60e7990876 Vendor libnetwork for network inspect --verbose changes
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 67086764647b1c16553d1dd057f0e1d2c775c625
Component: engine
2017-03-12 21:23:21 -07:00
8d7175a239 Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb
Vendor swarmkit 0e2d9eb
Upstream-commit: 43f8bce876c48d90fafd5fe9f9f223300bd06904
Component: engine
2017-03-10 16:33:15 -08:00
281516f8c3 Vendor swarmkit 0e2d9eb
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 79bf23845b7829bf68b9dda47af46886b274ac78
Component: engine
2017-03-10 11:15:44 -08:00
e65dda6e42 Merge pull request #31532 from aboch/vnd
Vendoring libnetwork @1a01921
Upstream-commit: 05e7f956bdf52a2a42c39d9d0b36169ec60b5b3a
Component: engine
2017-03-10 12:55:19 -05:00
d242c08875 Bump the version of go-connections
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 868f90a0dbcf9f898e035dc06290d8c91bb98155
Component: engine
2017-03-09 11:19:14 -08:00
5ef9a2c7ea Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 49131f3ad47bb6195d9ced8aa5f93faf011f9e58
Component: engine
2017-03-08 14:56:29 -08:00
e454be5cbf Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
0aea84a00e Merge pull request #31566 from AkihiroSuda/use-latest-vndr
rerun vndr
Upstream-commit: 7e031413f20946c9926767c1f16fb3d4cda56e6b
Component: engine
2017-03-08 12:16:50 +01:00
9b41265701 Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 39433318fe224e9066a892fc5834b38649ec86ac
Component: engine
2017-03-07 19:09:21 -08:00
3442ecd596 rerun vndr
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5a1b06d7fd6a0c8722a4f7aee1edf46d8e2a115b
Component: engine
2017-03-08 02:29:34 +00:00
ac28c83574 Seccomp Update
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 9067ef0e32c6a85384dad2a30ac3a49e2f9fe393
Component: engine
2017-03-07 22:19:46 +00:00
df253ac5fd Vendoring libnetwork @1a01921
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b005c7d6ebf7c980b1247532188dfe741659b175
Component: engine
2017-03-03 15:55:06 -08:00
56417c3da5 Merge pull request #30729 from dmcgowan/update-go-connections
Update go-connections package
Upstream-commit: d8b0d2b9e9e3d4b2537a2ebbbb8f6187ea755286
Component: engine
2017-03-01 18:24:32 -08:00
f2e35d377c Merge pull request #31393 from aaronlehmann/vendor-swarmkit-46bbd41
Vendor swarmkit 46bbd41
Upstream-commit: c956d25bfced952a40f001fe68c2e79eced3f200
Component: engine
2017-02-28 09:40:20 +01:00
dfcca19d95 Vendor swarmkit 46bbd41
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 99119fcafa41fb8c95e67b225a3da2902ce0e959
Component: engine
2017-02-27 11:51:00 -08:00
958266ff9f Vendoring libnetwork @bdc9dce
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ff6a3bef5ab895bf87058f05b5e838afd8ba8393
Component: engine
2017-02-24 11:08:53 -08:00
2fb912d7a8 Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6f0e2c8c8b29bdd9c9eb39f747207ec4dc081be1
Component: engine
2017-02-22 14:10:33 -08:00
0cc00d1673 Merge pull request #31055 from Microsoft/jjh/fix30278
Windows: Retry workaround for RS1/RS2 compute system enumeration
Upstream-commit: 7761c69e239171c6b388d53d03619eacc49338a0
Component: engine
2017-02-17 16:53:16 -08:00
cb4d6aeea8 Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0

The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291)
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608)
3. Global mode target replicas keep increasing (Issue #30854)
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938)
5. Define signals used to stop containers for updates (Issue #25696) (PR #30754)

This fix fixes #28291, #25608, #30854, #30938.
This fix is required by PR #30754.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ec860ca2526a65ec3b7059666b8e65bab9acf62c
Component: engine
2017-02-16 08:50:00 -08:00
c7ba5add5f Revendor Microsoft\hcsshim to v0.5.12
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9983a7b88f24b4cebdda1cfb1d5dd20fdd50820f
Component: engine
2017-02-15 10:16:16 -08:00
c619dbfa25 Vendoring libnetowrk @5537cb4
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 5b6048fd6302550904e60e371c8aabaf6af346b1
Component: engine
2017-02-14 11:52:57 -08:00
e18ea312b4 Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
This fix updates docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
from 545102ea07aa9796f189d82f606b7c27d7aa3ed3

Changes related to docker issue:
1. Validate insecure registry (`--insecure-registry`) values (30746)

This fix is related to 30746.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 20141b521923f69f8152d3c2ef4535c3cf3ef014
Component: engine
2017-02-13 16:37:47 -08:00
a855d6e84c Update go-connections package
fixes #30450

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 4f223337a5da48591119daf51269d77910f00b49
Component: engine
2017-02-09 16:10:38 -05:00
cb75ffb99b Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
This fix updates SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2.
Notable changes since last update (3ca4775ba4a5519e2225c3337c7db8901ec39d26):

1. Fix duplicated ports allocation with restarted swarm. (Docker issue #29247)
2. Topology-aware scheduling (Docker PR #30725)

Docker issue #29247 was labeled 1.13.1, though it is advised that
related SwarmKit changes only to be merged to master
(based on the feedback https://github.com/docker/swarmkit/pull/1802#issuecomment-274143500)

This fix fixes #29247 (master only).
This fix is related to #30725.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6fb3a9d33c08069cd9b5182b70b403a671385ed2
Component: engine
2017-02-08 11:59:13 -08:00
14c3328b3b Merge pull request #30790 from vdemeester/pr-30602
Carry #30602 : Bump go-units
Upstream-commit: 31f172bdb50091be8880caac83046401bb43fc17
Component: engine
2017-02-08 11:04:22 +09:00
c355cec53c Merge pull request #30457 from dmcgowan/distribution-reference-update-2
reference: use distribution reference and remove fork
Upstream-commit: 254fc83cba90ed79c78f4cb0cb33aeeaff492798
Component: engine
2017-02-07 22:01:25 +01:00
e1911d98d5 Bump go-units
To include  https://github.com/docker/go-units/pull/23
Fixes a unit test that fails because of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cb89d658dc6dca5f0efa21cac168ae82fea821d1
Component: engine
2017-02-07 21:58:56 +01:00
958fd45277 Update swarmkit vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2bea87393b7673fc88531851803f073198527021
Component: engine
2017-02-07 11:08:36 -08:00
0bc7415047 fetch the latest code with zero-harm but good-readability for Graylog2/go-gelf
update vendor.conf for github.com/Graylog2/go-gelf

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: 79d47a3bb763689bb7ea64da8a24c8ecfa6181c8
Component: engine
2017-02-07 17:27:17 +08:00
df1c58e788 Update distribution vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 24698a07cba89a08ac6fcc2c6e4097491b922883
Component: engine
2017-02-06 13:06:52 -08:00
7fb8ca1684 Merge pull request #30690 from aboch/vnd
Vendoring libnetwork @802895f
Upstream-commit: 1d3f6e4aaf8e83787a22017bd686c6d04c727710
Component: engine
2017-02-06 13:20:51 -05:00
0035afab8d Revendor github.com/spf13/pflag to 9ff6c6923cfffbcd502984b8e0c80539a94968b7
$ git log --oneline dabebe21bf79..9ff6c6923cff
9ff6c69 Add FlagSet.FlagUsagesWrapped(cols) which wraps to the given column (#105)
a9a634f Add BoolSlice and UintSlice flag types. (#111)
a232f6d Merge pull request #102 from bogem/redundant
5126803 Merge pull request #110 from hardikbagdi/master
230dccf add badges to README.md
c431975 Merge pull request #107 from xilabao/add-user-supplied-func-when-parse
271ea0e Make command line parsing available outside pflag
25f8b5b Merge pull request #109 from SinghamXiao/master
1fcda0c too many arguments
5ccb023 Remove Go 1.5 from Travis
86d3545 Clean up code

I am interested in 9ff6c69 for a followup.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: a6e536e415e125fba7578e2a1ee5c12fb380b0d9
Component: engine
2017-02-03 11:05:49 +00:00
eafbc1c086 Vendoring libnetwork @802895f
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 9e555ce7c3845219148ab4c16c9aa7efb84c2a89
Component: engine
2017-02-02 15:22:26 -08:00
313335dc3d Merge pull request #22563 from mlaventure/cgroup-devices
Allow adding rules to cgroup devices.allow on container create/run
Upstream-commit: 27f90acd61f4937f1f722082793e806261e527f7
Component: engine
2017-02-01 16:29:34 +01:00
bf18bba970 Revendor Microsoft/go-winio v0.3.8
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: da6739c99f7e6bf5036073a6c052e6c6d86a461b
Component: engine
2017-01-31 16:46:59 -08:00
b304d83344 Merge pull request #30117 from msabansal/natfix
Added support for dns-search and fixes #30102
Upstream-commit: c0a1d2e0d88ff3cae6802dfbd128c7739e8c2bcc
Component: engine
2017-01-31 11:05:29 +01:00
8c590c8511 Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
This fix updates SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
(from 037b4913929019d44bc927870bf2d92ce9ca261f)

The following issues in docker are related
- Can not update service in host publish mode (#30199) (fixed)
- Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (#29972) (needed)
- Explicitly disallow network pluginv1 creation in swarm mode
  (See discussion in docker/swarmkit/pull/1899, docker/swarmkit/pull/1894,
  and docker/docker/pull/30332#issuecomment-274277948)

This fix fixes #30199

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 849816dd0fbd70d0e46567fffc7416b667bff9b5
Component: engine
2017-01-29 08:11:26 -08:00
a8d9877163 Merge pull request #28304 from ijc25/jsonmessage-use-terminfo
use terminfo in pkg/jsonmessage
Upstream-commit: 2c948ac3e6b3b1440c5583cfa9d2c581e96280eb
Component: engine
2017-01-27 09:29:18 -08:00
c0d224023d Vendoring libnetwork @e8431956
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 03ab20291b255662708b4932df60e7b483dc2b8e
Component: engine
2017-01-26 18:08:18 -08:00
f5ab41022d Update cobra to v1.5.1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 98e7ec8e17259a5039b684f3b5f07cae0e4f5689
Component: engine
2017-01-26 07:21:50 -08:00
0dedd22a73 Merge pull request #30043 from dmcgowan/distribution-reference-update-1
Distribution reference update
Upstream-commit: e9c0de0de65182915d1cd205f06f5c903c20a29f
Component: engine
2017-01-24 20:38:20 -08:00
bb6348df00 Merge pull request #30394 from aboch/nl
Vendor vishvananda/netlink @ebdfb74
Upstream-commit: 23341a41a5bada3e6ff151c8f38c5983ff524959
Component: engine
2017-01-24 15:24:07 +01:00
7bd7e5b7ec Vendor netlink @ebdfb74
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: ed758b604a593b5d4b9d769461d6c44926d89d91
Component: engine
2017-01-23 22:47:37 -08:00
d93ce12d04 Vendor swarmkit, containerd, and related dependencies
Update swarmkit to 037b491.

As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3e987e1732ee5c51e95934afabba3fedfd16c4af
Component: engine
2017-01-23 17:51:14 -08:00
58b37acff7 Merge pull request #30145 from anusha-ragunathan/ps-swarm
Pass plugingetter as part of swarm node config.
Upstream-commit: 2b89356c07b1824041985386d0c9485e49d9b987
Component: engine
2017-01-20 10:35:49 -08:00
b4573da32a Vendor swarmkit
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00