Vincent Demeester
bd9109a83b
Merge pull request #28075 from yongtang/27958-docs-follow-up
...
Follow up docs update for PR #27958
Upstream-commit: b8140249b45712e667fa7ab1ea5d4997bb533f69
Component: engine
2016-11-07 09:21:40 +01:00
Vincent Demeester
26a4e23cf3
Merge pull request #28065 from lixiaobing10051267/masterServerEror
...
add error information to distinguish different test scene
Upstream-commit: 325eaa7ba475233586d74831c446bb341f48fe8a
Component: engine
2016-11-07 09:16:16 +01:00
Vincent Demeester
3a37a471f0
Merge pull request #28020 from YuPengZTE/devArg
...
Align arg with other cli
Upstream-commit: 6e0893f304ec5dd994f81ef4c41cc174d35d6a1d
Component: engine
2016-11-07 08:58:51 +01:00
Daniel Nephin
f49643c1dd
Merge pull request #28103 from Microsoft/jjh/removevalidatestubs
...
Remove Windows CI stubs from hack/
Upstream-commit: 9c8e1c3c06d8a9cab623e75dcdab3ba9e84c6856
Component: engine
2016-11-06 19:39:18 -05:00
John Howard
c6c5a0aaa0
Remove Windows CI stubs from hack/
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d945441e23e8c7a5ccd541062da8e206264127fb
Component: engine
2016-11-05 21:01:06 -07:00
yupeng
705e095e8b
Align arg with other cli
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: c09277d5c336594fe384cf3ae5fc76eafdb80728
Component: engine
2016-11-05 13:47:02 +08:00
Yong Tang
0453189408
Follow up docs update for PR 27958
...
This fix is a follow up for any additional docs update for PR 27958.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f82f8eeaf8bffffbea9a05fb061a3bf528432a78
Component: engine
2016-11-04 20:18:40 -07:00
Sebastiaan van Stijn
d2784c37b9
Merge pull request #28085 from aaronlehmann/remove-comment
...
distribution: Remove misleading comment
Upstream-commit: c5ceb0f945d390500a0045b14ffe4dcecfe46a85
Component: engine
2016-11-04 19:57:57 -07:00
Tibor Vass
5bab1b7684
Merge pull request #28084 from thaJeztah/add-andrew-and-alessandro
...
Add Andrew and Alessandro as curator
Upstream-commit: 29d85753cd832ba6d5b02898b854d8bb14de704f
Component: engine
2016-11-04 17:30:16 -07:00
Aaron Lehmann
5a8e3be256
distribution: Remove misleading comment
...
Remove the following comment in pullV2Tag:
// NOTE: not using TagService.Get, since it uses HEAD requests
// against the manifests endpoint, which are not supported by
// all registry versions.
This is actually not an issue, because TagService.Get does a fallback to
GET if HEAD fails. It has done this ever since TagService was added to
the distribution API, so this comment was probably based on an early
version of TagService before it was merged, or was always a
misunderstanding.
However, we continue to use ManifestService.Get instead because it
saves a round trip. The manifest can be retrieved directly instead of
resolving the digest first.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 99c59d5988d20a6722224da918fdec299d3aaded
Component: engine
2016-11-04 17:10:47 -07:00
Sebastiaan van Stijn
f6a55fc731
Add Andrew and Alessandro as curator
...
They're helping out with triaging, so
just making this official :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7eb4a1d61683c550254169425ab0171f272d1df3
Component: engine
2016-11-04 17:08:07 -07:00
Sebastiaan van Stijn
97826ed120
Merge pull request #28081 from LK4D4/update_for_solaris
...
vendor: update package for solaris support
Upstream-commit: 1c62d8619d3b629cd8aae3bf44a5eb3e17c1cfb9
Component: engine
2016-11-04 17:01:16 -07:00
Sebastiaan van Stijn
8491327d68
Merge pull request #24194 from Microsoft/WindowsCpuCount
...
Windows: Added processor count option
Upstream-commit: e8c9063353e8afa26a8aea796893a78ba8fcc41c
Component: engine
2016-11-04 16:13:43 -07:00
Alexander Morozov
0606b2f6d5
Merge pull request #28077 from aluzzardi/swarmkit-revendoring
...
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Upstream-commit: bb1153a613933dc25e2a112416ead9106ed00f4c
Component: engine
2016-11-04 14:59:05 -07:00
Alexander Morozov
3db46dc6b5
vendor: update package for solaris support
...
Update includes next packages:
* golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
* github.com/fsnotify/fsnotify v1.2.11
* github.com/tonistiigi/fifo b4c3a126bac4051ae3fa83bfcb3c60ab7a9da0dd
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 553b0b9731c5b2b75af1fa27c17f2a19cf2a0160
Component: engine
2016-11-04 14:39:47 -07:00
Sebastiaan van Stijn
cdb85c6084
Merge pull request #28068 from tophj-ibm/switch-all-golang-download-links
...
switch all go download links to https://golang.org/dl
Upstream-commit: 6087185676ef838c20af3dace1bbd442b6bdb53c
Component: engine
2016-11-04 14:21:58 -07:00
Kenfe-Mickaël Laventure
854000b31e
Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
...
Use sha512 when gpg signing builds
Upstream-commit: 3a9322e9ec9ed64b1e165fb901fde0f8021471d3
Component: engine
2016-11-04 14:08:52 -07:00
Victor Vieux
20cafdbd7e
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07
Component: engine
2016-11-04 13:49:19 -07:00
Darren Stahl
c8300bf35f
Windows: Add cpu count option
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
2016-11-04 13:38:50 -07:00
Justin Cormack
425de017f6
Merge pull request #28070 from runcom/seccomp-path-fixes
...
Seccomp path fixes
Upstream-commit: d7d0bc1d583c544b72e3a41827d9cc6ccb964438
Component: engine
2016-11-04 20:36:35 +00:00
Michael Crosby
ac2b6ee292
Merge pull request #27737 from justincormack/no-ambient-1.13
...
Revert ambient capabilities for 1.13
Upstream-commit: cac13fc131c4e539a412ef46d3828dc79453c524
Component: engine
2016-11-04 12:52:21 -07:00
Andrea Luzzardi
fc88fcd016
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
Andrea Luzzardi
9dcd59a93e
Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
...
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 9322636c8926f155a10d9679e364e3f8e86203d6
Component: engine
2016-11-04 12:26:37 -07:00
Misty Stanley-Jones
a4610ccc0a
Merge pull request #28064 from lixiaobing10051267/masterInstallation
...
modify URL because installation directory removed
Upstream-commit: da499758b8f4fd96213889964ca206b2396bed48
Component: engine
2016-11-04 12:06:37 -07:00
Victor Vieux
ffbf855e39
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
2016-11-04 12:04:14 -07:00
Sebastiaan van Stijn
44dc3f21c6
Merge pull request #28072 from Microsoft/jjh/api124
...
Windows: Allow API v1.24
Upstream-commit: 24d822d179df9a7ab668d280efbd64a8b1735fe2
Component: engine
2016-11-04 11:57:42 -07:00
Sebastiaan van Stijn
cee03f5dd3
Merge pull request #28073 from albers/completion-service-create--hostname
...
Add bash completion for `docker service create --hostname`
Upstream-commit: c859a9ff1fe6a1caa384c012bc007ab601e50ed7
Component: engine
2016-11-04 11:57:08 -07:00
Aaron Lehmann
20a1f51ba7
Merge pull request #28057 from aaronlehmann/lint-api
...
Run lint on most of api/types
Upstream-commit: ab2593457991fa037346544b91d0bdb64963d5e2
Component: engine
2016-11-04 11:56:02 -07:00
Antonio Murdaca
9ce11130e0
cli/info: fix seccomp warning
...
also reword seccomp warning around default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c68e75e51d58167b5b21e77bbc7b701fe0888096
Component: engine
2016-11-04 19:25:51 +01:00
Antonio Murdaca
04676aa104
docs: update for new secopts struct in GET /info
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: e6ec90608ca06431920afa6d4c56130af9c02a28
Component: engine
2016-11-04 19:25:51 +01:00
Michael Crosby
3f43af0758
Merge pull request #27958 from yongtang/27921-cpus
...
Add `--cpus` flag to control cpu resources
Upstream-commit: 6572c467164f99ae00150def4ac282bb46f85bce
Component: engine
2016-11-04 11:18:17 -07:00
Harald Albers
889abdab10
Add bash completion for docker service create --hostname
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
Justin Cormack
b865964d4d
Use runc version built without ambient capabilities
...
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.
Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.
Test for #27590
Update runc.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: c5251f7116e3d9095a7169fc31bd170dff997c2e
Component: engine
2016-11-04 17:25:28 +00:00
John Howard
46c5a7990c
Windows: Allow API v1.24
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e4af39aeb311a08fd2d15e01eabd6bae9db36382
Component: engine
2016-11-04 10:10:42 -07:00
Derek McGowan
b6c8ff694d
Use sha512 when gpg signing builds
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 201f8043102efbbb624b3d70001878328cbbf655
Component: engine
2016-11-04 09:45:13 -07:00
Yong Tang
133eec9cfa
Add --cpus flag to control cpu resources
...
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.
Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.
This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.
This fix adds integration tests to cover the changes.
Related docs (`docker run` and Remote APIs) have been updated.
This fix fixes 27921.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 846baf1fd3efcbfbf9d3eb99e436ca9a59d3e185
Component: engine
2016-11-04 09:43:10 -07:00
Justin Cormack
71fb2940a4
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
Upstream-commit: efa5e85cf7c6d91fbc8003770fee14bd716a2fdd
Component: engine
2016-11-04 15:45:30 +00:00
Vincent Demeester
bf52c4c327
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
Upstream-commit: b4e14c6edcd201f0b5fade154714218a41005d77
Component: engine
2016-11-04 15:22:55 +01:00
Christopher Jones
4ca3d7782b
switch all go download links to https://golang.org/dl
...
this switches all go download links to use a redirect,
https://golang.org/dl/ instead of the direct source.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 732d1035d2f1d8f0b6f3410035fa393431b93d89
Component: engine
2016-11-04 09:03:41 -05:00
lixiaobing10051267
062deefffb
add error information to distinguish different test scene
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 925c1427a8ed308ce55a0eed709c56515aeabcc4
Component: engine
2016-11-04 17:16:11 +08:00
lixiaobing10051267
92845e354d
modify URL because installation directory removed
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 56cca9292252efbcecad69fc965d63d99fda5e5e
Component: engine
2016-11-04 16:40:15 +08:00
Vincent Demeester
1931090ba1
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
Upstream-commit: 16bcc1afddd83de27e22ac519af62280a968534b
Component: engine
2016-11-04 08:15:49 +01:00
Vincent Demeester
930e01c1dd
Merge pull request #28035 from thaJeztah/add-test-for-long-loglines
...
add tests for long log-lines and trailing lines
Upstream-commit: 9f7cc7d0320b93236169a7e0f6f9d69fa8c91bb8
Component: engine
2016-11-04 07:59:20 +01:00
Aaron Lehmann
c5466cbef3
Run lint on most of api/types
...
The validate-lint script excludes any package names that match
api/types. However, the only subpackage that appears to cause issues is
api/types/container (due to stuttering names). Tighten the filtering so
that other code inside api/types is validated.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: efa7068133f224386dbcceb19a6dd31d1d2e9404
Component: engine
2016-11-03 19:08:24 -07:00
Alexander Morozov
7379675f65
Merge pull request #27912 from LK4D4/vndr
...
project: use vndr for vendoring
Upstream-commit: c07234707878412eaaeab252af19adac8cf25d6b
Component: engine
2016-11-03 18:30:19 -07:00
Brian Goff
4fb898db56
Merge pull request #28052 from mavenugo/nid
...
Handle NetworkDettach for the case of network-id
Upstream-commit: 7248742ae7127347a52ab9d215451c213b7b59da
Component: engine
2016-11-03 21:00:37 -04:00
Victor Vieux
9d6e24532c
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3e43fa28ecc265ebbb95afd94017e7e3d5ccfdc0
Component: engine
2016-11-03 17:31:12 -07:00
Brian Goff
ba87ff5ff2
Merge pull request #28046 from tophj-ibm/make-debs-1610
...
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04:00
Sebastiaan van Stijn
a512b3ec7d
Merge pull request #28000 from riyazdf/revert-27804
...
Revert "Update authz plugin list on failure."
Upstream-commit: 2793f198deb86e250e769b97fe5a1a729b829ce6
Component: engine
2016-11-03 17:17:22 -07:00
Misty Stanley-Jones
69698a95a6
Merge pull request #28053 from gdevillele/pr_fix_docs_frontmatter_keywords_2
...
fix frontmatter keywords value type (string, instead of []string) in /docs/reference/
Upstream-commit: a89f8f2d9318984dedc291cea8dca6fecf50c9e5
Component: engine
2016-11-03 17:16:40 -07:00