062414bb0e
fix frontmatter keywords value type (string, instead of []string) in /docs/reference
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 248c699ec88bb249ce9fd03001d13f29ac0b4b99
Component: engine
2016-11-03 15:48:30 -07:00
362409ed3f
Merge pull request #27331 from Microsoft/jjh/spew
...
Add spew debugging
Upstream-commit: 02bc2e652b2a254a1afcc66cb32827fa0e65a6fa
Component: engine
2016-11-03 16:36:20 -04:00
d7dd3c497e
Merge pull request #27383 from runcom/authz-peercerts
...
pkg/authorization: send request's TLS peer certificates to plugins
Upstream-commit: 16f6b3e8a9f22df5cbd3454f6e68a8be7e5f04cf
Component: engine
2016-11-03 13:22:29 -07:00
373f6a5b36
Merge pull request #28040 from vieux/fix_prune_container_msg
...
fix double [y/N] in container prune
Upstream-commit: e9158358e5cf227688aaf4529625395559d6bb2d
Component: engine
2016-11-03 13:19:10 -07:00
bff4ddec3e
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eadb5b315be2ca51aa59ce55ef34478fbdceefa2
Component: engine
2016-11-03 10:33:17 -07:00
6477b96f99
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
Upstream-commit: b2641bd9df5c2511f9af5c811590617884c24a0f
Component: engine
2016-11-03 10:30:55 -07:00
6483cebb58
Merge pull request #27873 from duglin/fixContChar
...
Fix case where \ at EOF made the builder ignore the command
Upstream-commit: ecf405b64de82bbf565bce6e4610c04a29113958
Component: engine
2016-11-03 10:30:15 -07:00
ed09e04a52
Merge pull request #27164 from cpuguy83/carry_24205
...
Fix volume creates blocked by stale cache entries
Upstream-commit: cf55397e130e6ab04ad723ef014cf49a3b62998e
Component: engine
2016-11-03 10:28:13 -07:00
f6fb29849a
Merge pull request #27968 from vieux/add_volume_test
...
add test plugin install --disable and volume ls
Upstream-commit: 6ee25e6277c930c71ff0e5c68ec6d66845b7f88f
Component: engine
2016-11-03 10:22:52 -07:00
a8f159283e
Spew debugging
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4c62b1263648833122828cf8cc8259f5b7e32da5
Component: engine
2016-11-03 10:05:11 -07:00
ec058523ee
Vendor davecgh/gospew @ 6d212880
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3b6cd20b0b123a48cb3a484f194b9ec83d1d0568
Component: engine
2016-11-03 09:35:58 -07:00
bdd83cf850
Fix volume creates blocked by stale cache entries
...
When a conflict is found in the volume cache, check with the driver if
that volume still actually exists.
If the volume doesn't exist, purge it from the cache and allow the
create to happen.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6a0bdffc1adf9225c6cca92f741ccafd2f90a618
Component: engine
2016-11-03 11:56:44 -04:00
e82a3896c3
Merge pull request #27599 from estesp/getent-path
...
Add support for looking up user/groups via `getent`
Upstream-commit: 81683e898a53a7bcbcb0e812db640173c3895c28
Component: engine
2016-11-03 15:11:42 +00:00
e11e25579b
added node ip autodetection
...
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 9bcf623719104fbd196ab0ca14af48f790980499
Component: engine
2016-11-03 08:10:14 -07:00
d1279f3328
Fix case where \\ at EOF made the builder ignore the command
...
Came from looking at issue #27545
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eaf0b5708fc91ab0c78eeee1a2c9c1251439d4a8
Component: engine
2016-11-03 05:48:49 -07:00
19febb4ca7
Merge pull request #27934 from yuexiao-wang/volume-create
...
Update descriptions for the docker volume sub-command, such as create，list and inspect
Upstream-commit: aa90a531c598af4ace14ee9e96021743fe4cff2e
Component: engine
2016-11-03 03:12:10 -07:00
bb59ba04f3
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cf5fadeb0c8d1c08c0f7f59e9d530776c92c728a
Component: engine
2016-11-03 22:40:04 +08:00
9f21bdfa4b
Merge pull request #26825 from AkihiroSuda/mountcli
...
cli: add `--mount` to `docker run`
Upstream-commit: e93f84a48bb394ed181aa48d9400922b292eb15a
Component: engine
2016-11-03 03:11:44 -07:00
5e989e429c
Merge pull request #27951 from LK4D4/dump_always_to_file
...
daemon: always dump stack to file
Upstream-commit: 19b5b4aada27e85fc888a576e90aee626bc8bcfa
Component: engine
2016-11-03 00:35:06 -07:00
2213e9bb9f
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 273eeb813c1db0f42c2ad5e053972eeb00907568
Component: engine
2016-11-03 07:08:59 +00:00
f396f287a0
Merge pull request #28016 from thaJeztah/dont-include-powershell-in-tgz
...
Don't include PowerShell completions in tgz
Upstream-commit: 0f9ba0ea709bacce4ba321c613ad97db0838d2f9
Component: engine
2016-11-02 23:32:48 -07:00
fb8fd8dbba
Merge pull request #28006 from dmcgowan/clean-overlay2-layerstore
...
Cleanup invalid code in overlay2 and layer store
Upstream-commit: 1f4137857f6eb8edcbefe591e1abe04d83da3416
Component: engine
2016-11-02 23:16:38 -07:00
a35b88e218
Merge pull request #27889 from Microsoft/jjh/windockerfile
...
Windows: dockerfile tweaks
Upstream-commit: 5c9e38b73f4f5b6f2984436f6defd74a1eea9c9c
Component: engine
2016-11-02 23:08:27 -07:00
8c2f0234f4
Merge pull request #27973 from yuexiao-wang/add-stack
...
Add stack service and fix typos
Upstream-commit: 9a6f26ce551dd4b6a76d060675f2ceb97db4680b
Component: engine
2016-11-02 23:04:54 -07:00
5f56134046
Add stack service and fix typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0a56e81ca4d7af22e5c623569a89d800a6778ed1
Component: engine
2016-11-03 19:21:27 +08:00
63c8414c8b
Don't include PowerShell completions in tgz
...
The PowerShell completion script was outdated,
and removed from this repository in
65fdbf0210e8faa1598515a7fd7ef4ed33d68d43.
A more up to date implementation can be found
here; https://github.com/samneirinck/posh-docker
Removing this script from the tgz
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1be4b0e0ccbce268e308ff5955549b404751e0a9
Component: engine
2016-11-02 21:51:58 -07:00
42774a8628
Merge pull request #27849 from miaoyq/clean-up-redundant-constants
...
Clean up the constants in 'libcontainerd' that are no longer in use
Upstream-commit: 877c86042885feb3b773f215817ab5447aa1468a
Component: engine
2016-11-02 23:01:59 -04:00
184a08cc1e
Merge pull request #27963 from darrenstahlmsft/RenameDelete
...
Windows: Rename layers before deletion
Upstream-commit: cb352501af9e59f10f58846d4154c76726530753
Component: engine
2016-11-02 19:20:39 -07:00
de4a768f1f
Merge pull request #27746 from Microsoft/jjh/pscompletion
...
Redirect powershell completion
Upstream-commit: 11605903d0a0126c8b712a9d4cda2614622e0f48
Component: engine
2016-11-02 19:08:38 -07:00
5fae8682b8
Merge pull request #28007 from justincormack/check-config-error
...
Make the check-config script return success or failure
Upstream-commit: a1a93f631f06a495674f93e2572098a900aa093b
Component: engine
2016-11-02 18:23:59 -07:00
f083ff7a7d
Merge pull request #27986 from milindchawre/fix_21803
...
Fixes #21803 : Removing unused configuration in daemon/logger/fluentd
Upstream-commit: 666377b23e6da4793ebbc8ccbe084ddc599ca8d1
Component: engine
2016-11-02 21:03:15 -04:00
1364d97991
Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
...
add replicated in service scale command description
Upstream-commit: d83f56ee5fa6e398a4205a6d4d32feda560df120
Component: engine
2016-11-02 18:01:59 -07:00
c39056bb71
add test plugin install --disable and volume ls
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 7236e42046a8e80ac5e35c46b0910859fcbd814d
Component: engine
2016-11-02 17:03:46 -07:00
74c006a5ce
Make the check-config script return success or failure
...
Although primarily a human readable script, it is quite useful
to return success or failure from this script so it can be used
as a basic test.
Fail if any check fails, including some that are optional,
other than the storage driver tests, where only one needs to
succeed, so the system has at least one workable storage driver.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 6d116ffbbbc597994855f1b6fe86af324ac649de
Component: engine
2016-11-02 23:23:52 +00:00
94f5e97be8
Cleanup invalid code in overlay2 and layer store
...
The overlay2 change ensures that the correct path is used to resolve the
symlink. The current code will not fail since the symlinks are always given
a value of "../id/diff" which ends up ignoring the incorrect "link" value.
Fix this code so it doesn't cause unexpected errors in the future if the
symlink changes.
The layerstore cleanup ensures that the empty layer returns a tar stream if
the provided parent is empty. Any value other than empty still returns an
error since the empty layer has no parent. Currently empty layer is not
used anywhere that TarStreamFrom is used but could break in the future if
this function is called.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 6622cc970e27a7bf2798d751ed276265a3a2d404
Component: engine
2016-11-02 16:13:53 -07:00
8904258447
Merge pull request #27838 from dperny/swarm_support_npipe
...
Support Windows Named Pipe for Swarm Mode
Upstream-commit: ed1d57c5f9a24c6172f5a782868cdf90fee0dc6c
Component: engine
2016-11-02 16:00:38 -07:00
bbfe527f95
Merge pull request #27999 from gdevillele/fix_frontmatter_keywords
...
fix frontmatter in reference md files
Upstream-commit: 8f6fd3687d6114d019a36c509184d73370eacbd2
Component: engine
2016-11-02 15:00:40 -07:00
5ca818f32c
Merge pull request #27990 from crosbymichael/grimes-11-2
...
Update init to fe069a03affd2547fdb05e5b8b07202d2e4
Upstream-commit: 42ef2bd4fea4d79eb584620d35f8646caa52ecdd
Component: engine
2016-11-02 14:27:31 -07:00
1045ce080e
fix frontmatter in reference md files
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 8d61e36edc8406a17420e2d8cf76d2471d3c5236
Component: engine
2016-11-02 14:23:27 -07:00
018c388beb
Merge pull request #27918 from dmcgowan/use-system-certs
...
Merge system certificate pool with custom certificates
Upstream-commit: 1e51f99684be5aa4af52719f95e5870489c8658f
Component: engine
2016-11-02 13:51:58 -07:00
4399a05e84
use named pipe on windows
...
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 5b6c565f74731201f7a03163516048f454e9e9d5
Component: engine
2016-11-02 13:47:35 -07:00
48c9662bdf
Merge pull request #27914 from riyazdf/check-plugins-on-startup
...
Check authz plugins on daemon startup, add v2 integration tests
Upstream-commit: 4a955dc4d476dd709037805492e7e8e8f10089f9
Component: engine
2016-11-02 13:38:32 -07:00
9d6b097c5c
Merge pull request #27980 from allencloud/change-description-in-node-rm-force-flag
...
node rm can be applied on not only active node
Upstream-commit: 5e5c7d521669015aecb3b1880f106f700414dfd5
Component: engine
2016-11-02 13:35:48 -07:00
05154c1d45
Merge pull request #27995 from vdemeester/vendor-swarmkit-for-templating
...
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
Upstream-commit: 197befe047e409bdcd612a517ac687569f5748ac
Component: engine
2016-11-02 13:32:13 -07:00
7db9c8b80c
Merge pull request #27991 from Microsoft/jjh/testapiclientversionoldnotsupported
...
Fix TestAPIClientVersionOldNotSupported
Upstream-commit: ecd806cdf1360155ee20bf7279b668346475bec7
Component: engine
2016-11-02 13:10:04 -07:00
e717ff6f92
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cff3cdd35a85e01f18851ecf86b2ae4b6a867cc7
Component: engine
2016-11-02 19:43:27 +01:00
1e794586e4
Merge pull request #27989 from dnephin/fix-swagger-gen
...
Fix swagger-gen
Upstream-commit: d0d0f982f9d43e1d14d098b4cfd27c7c926638b2
Component: engine
2016-11-02 11:40:12 -07:00
f5432a5e82
daemon: always dump stack to file
...
Dumping to log is unusable in 90% of cases and inspecting file is much
more convenient.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e5d36586acdd020a0a6d5840ea1fd060b6e3504b
Component: engine
2016-11-02 11:22:43 -07:00
26128eb43e
Merge pull request #27962 from epeterso/patch-2
...
remove world/group writable perms
Upstream-commit: fae5a9e053ad06bea0429babae2507762d8cc1de
Component: engine
2016-11-02 11:22:40 -07:00
3b23b168fa
Check authz plugins are valid on daemon startup, add integration tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 2b045027ce32a8f938c83adcf5960f1bffdb3f8f
Component: engine
2016-11-02 11:20:54 -07:00
