Commit graph

29300 commits

Author SHA1 Message Date
John Howard
f93c04d1ed Merge pull request #28667 from Microsoft/jjh/env-case-sensitive
Windows: Case insensitive env vars
2016-11-23 14:40:16 -08:00
Alexander Morozov
6b12887c3e Merge pull request #28777 from Microsoft/jjh/fixtypo-bin-mounts
Fixes typo 'bin-mounts'
2016-11-23 14:04:03 -08:00
John Howard
c8c1dfbaf3 Fixes typo 'bin-mounts'
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-23 14:01:57 -08:00
Vincent Demeester
205291c5f3 Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy
Better error message on stack deploy when not a swarm manager
2016-11-23 22:47:13 +01:00
John Howard
b2049a84de Windows: Case insensitive env vars
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-23 12:57:33 -08:00
Victor Vieux
ae64cae74e Merge pull request #28760 from ehazlett/carry-28576
Update Secret Command help (carry #28576)
2016-11-23 12:29:55 -08:00
Alexander Morozov
1640bb23b1 Merge pull request #28728 from aluzzardi/swarmkit-revendor-53fcdeba083627b1a2616612a103019b73c6d5ce
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
2016-11-23 09:24:23 -08:00
Daniel Nephin
c72daf953a Better error message on stack deploy against not a swarm.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-23 12:15:11 -05:00
Vincent Demeester
2c978bd946 Merge pull request #28765 from vdemeester/update-docker-info-docs
Update docker info cli reference documentation
2016-11-23 17:27:08 +01:00
Vincent Demeester
bbe1a7f84f Merge pull request #28749 from runcom/remove-notneeded-unmarshal
daemon: remove not needed unmarshal
2016-11-23 17:22:23 +01:00
Vincent Demeester
d28eaa1171
Update docker info cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 17:20:12 +01:00
Sebastiaan van Stijn
6e8479bdfa Merge pull request #28753 from vdemeester/fix-userns-integration-cli
Fixes some integration-cli on userns
2016-11-23 16:14:41 +01:00
erxian
d87c91e39f update secret command
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-23 10:07:09 -05:00
Vincent Demeester
55cd9c4edc Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc
Update plugin enable cli reference documentation
2016-11-23 15:53:02 +01:00
Vincent Demeester
43297dd6f8
Update plugin enable cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 15:42:40 +01:00
Sebastiaan van Stijn
04d60a44d7 Merge pull request #28743 from albers/docs-stack-experimental
Move `docker stack` docs out of experimental
2016-11-23 14:17:09 +01:00
Vincent Demeester
eb5fe064cf
Fixes some integration-cli on userns
Mainly adding requirements on Network or NotUserNamespace to make it pass.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 14:03:53 +01:00
Antonio Murdaca
30b8712e93
daemon: remove not needed unmarshal
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-23 12:53:25 +01:00
Harald Albers
bb96e18b19 Move docker stack docs out of experimental
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-23 11:14:38 +01:00
Alexander Morozov
5afdacb20e Merge pull request #28455 from Microsoft/jjh/autogen
Windows: Native autogen
2016-11-22 18:18:12 -08:00
Victor Vieux
7c6f001248 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect
Update secret inspect to support IDs
2016-11-22 17:39:48 -08:00
Victor Vieux
0633c558bb Merge pull request #28733 from thaJeztah/use-official-fedora25-image
Use official fedora 25 image
2016-11-22 17:38:01 -08:00
Sebastiaan van Stijn
545a2f009e
Use official fedora 25 image
Fedora 25 was released today, and the official
image will be available soon.

This removes the temporary override, so that
we can build using the official image.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-23 02:19:02 +01:00
Andrea Luzzardi
51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-22 17:01:02 -08:00
Tõnis Tiigi
5c1826ec4d Merge pull request #28683 from darrenstahlmsft/SystemDLL
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
2016-11-22 16:58:30 -08:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest
Do not display the digest or size of swarm secrets [1.13]
2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-22 18:18:56 -05:00
cyli
2c0613540a Do not display the digest or size of swarm secrets
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-22 18:13:27 -05:00
Darren Stahl
22c83c567f Swap usage of LazyDLL and LoadDLL to LazySystemDLL.
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 14:57:11 -08:00
Tibor Vass
6547609870 plugins: misc fixes
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-22 14:32:07 -08:00
Vincent Demeester
d145b0b93f Merge pull request #28726 from jacobtomlinson/docs-pull-concurrent
Document pull concurrent options
2016-11-22 23:11:27 +01:00
Jacob Tomlinson
b303381a4d Add concurrent uploads/downloads section
Document and link to the concurrent uploads/downloads daemon option.

Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk>
2016-11-22 21:59:10 +00:00
Sebastiaan van Stijn
0415525049 Merge pull request #26833 from cpuguy83/use_mounts_api_for_services
Use container Mounts API for Swarm containers.
2016-11-22 22:48:54 +01:00
Victor Vieux
c025d56504 Merge pull request #28691 from aluzzardi/service-logs-no-follow
[experimental] service logs: Support no-follow mode
2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
Prepare docs and Swagger definition for automatically generated API docs
2016-11-22 22:47:38 +01:00
Evan Hazlett
70d2cefd51 update secret inspect to support IDs
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets.  This also cleans up the
help text for consistency.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-11-22 16:01:16 -05:00
Sebastiaan van Stijn
61d9ba930c Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
Revendor go-winio to v0.3.7
2016-11-22 21:35:45 +01:00
Sebastiaan van Stijn
9d0050727d Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE
Ensure vmcompute.dll exists during daemon start
2016-11-22 21:31:45 +01:00
Sebastiaan van Stijn
86eae4018a Merge pull request #28698 from YuPengZTE/devErrot
error strings should not be capitalized or end with punctuation
2016-11-22 21:25:09 +01:00
Sebastiaan van Stijn
0cbc187447 Merge pull request #28715 from thaJeztah/add-warning-for-windows-plugins
add note that windows does not support managed plugins
2016-11-22 21:23:13 +01:00
Sebastiaan van Stijn
658b89192f Merge pull request #28703 from runcom/full-hash-commit-runc
hack/dockerfile/binaries-commits: use full commit hash for docker info
2016-11-22 21:14:00 +01:00
Tõnis Tiigi
d1a137b10c Merge pull request #28681 from aboch/vnd
Vendor libkv @ 1d84310
2016-11-22 11:46:22 -08:00
Sebastiaan van Stijn
6e11ca0fdf Merge pull request #28672 from mlaventure/arm-ubuntu-xenial
Add support for armhf ubuntu-xenial deb
2016-11-22 19:57:11 +01:00
Darren Stahl
873a26697d Revendor go-winio to v0.3.7
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 10:39:42 -08:00
Brian Goff
39e2e07567 Merge pull request #28668 from anusha-ragunathan/fix_teardown
Check for valid daemon in TearDownTest.
2016-11-22 13:26:08 -05:00
Vincent Demeester
4bc96372d8 Merge pull request #28718 from albers/docs-fix-copmose
Fix typo in docs (Copmose)
2016-11-22 19:25:47 +01:00
Brian Goff
821aeb6a6f Use container Mounts API for Swarm containers.
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-22 13:23:51 -05:00
Tibor Vass
677e14643c Merge pull request #28595 from anusha-ragunathan/plugin_timeout
Allow HTTP client timeout to be configurable on plugin enable.
2016-11-22 10:17:10 -08:00
Harald Albers
2e12055687 Fix typo in docs (Copmose)
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-22 19:09:30 +01:00