Commit Graph
36884 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 7e77a4eb36 Merge pull request #27910 from dperny/node_ip_in_raft
Auto-detect node IP address 
Upstream-commit: 938d24ab51
Component: cli
2016-11-03 10:30:55 -07:00
Sebastiaan van Stijn 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
John Howard 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
Anusha Ragunathan 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
Victor Vieux 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
John Howard a8f159283e Spew debugging
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4c62b1263648833122828cf8cc8259f5b7e32da5
Component: engine
2016-11-03 10:05:11 -07:00
Sebastiaan van Stijn f08ca94e09 add tests for long log-lines and trailing lines
this adds new tests to test logging of long log-lines
(without newlines), and trailing log-lines.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ee34dd9f8a8a0246dae94385ed2ca56691085842
Component: engine
2016-11-03 10:01:00 -07:00
John Howard 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
Brian Goff 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
Harry Zhang 0e37fcada2 return when error happens on listener close
Signed-off-by: Harry Zhang <harryz@hyper.sh>
Upstream-commit: 390fe752a2883f6f3c3edf66cf2a61862e3e7b2e
Component: engine
2016-11-03 23:13:24 +08:00
Justin Cormack 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
Drew Erny 4e0dd7ba31 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: 2cd4028024
Component: cli
2016-11-03 08:10:14 -07:00
Drew Erny 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
Doug Davis 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
Boaz Shuster 928dd535e8 Return an empty stats if the container is restarting
In case, a container is restarting indefinitely running
"docker stats --no-stream <restarting_container>" is suspended.

To fix this, the daemon makes sure the container is either not
running or restarting if `--no-stream` is set to true and if so
returns an empty stats.

Should fix #27772.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 786a95493d54d74fa3eef020c1ec03baa4fe91c4
Component: engine
2016-11-03 13:26:24 +02:00
Vincent Demeester 4a8233909f 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: ee42b42f3c
Component: cli
2016-11-03 03:12:10 -07:00
yuexiao-wang f4a9cbc8ae Update for docker volume create
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 816560ffe9
Component: cli
2016-11-03 22:40:04 +08:00
Vincent Demeester 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
yuexiao-wang 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
Vincent Demeester 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
Nikolay Milovanov c0f36a9c86 Adding the hostname option to docker service command
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
Upstream-commit: b222aa1a582f24d0164a72883e5f6503cc6a1d64
Component: engine
2016-11-03 10:02:14 +00:00
Nikolay Milovanov 2cef813aa2 Adding the hostname option to docker service command
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
Upstream-commit: 19b7bc1739
Component: cli
2016-11-03 10:02:14 +00:00
yupeng 9e5c08ce2b Add for String
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: cd46f06934
Component: cli
2016-11-03 16:15:26 +08:00
yupeng d70c70756d Add for String
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 167daf5060e75a597d70fd7240d59d34b160f8ef
Component: engine
2016-11-03 16:15:26 +08:00
Vincent Demeester 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
Akihiro Suda 01e1a7306e cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 51cb4aa7b8
Component: cli
2016-11-03 07:08:59 +00:00
Akihiro Suda 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
milindchawre 1e7ea7f047 Fixes #27798 : Update help for --blkio-weight parameter
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: ec7d9291b8
Component: cli
2016-11-03 06:42:15 +00:00
milindchawre 6b390813d6 Fixes #27798 : Update help for --blkio-weight parameter
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: 51012aa0aff7d7873af7d96347f43b06707e5c9a
Component: engine
2016-11-03 06:42:15 +00:00
Vincent Demeester 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
Vincent Demeester b5f18791bf Add support for Names and ID in stats format
This adds support to display names or id of container instead of what
was provided in the request.

This keeps the default behavior (`docker stats byname` will display
`byname` in the `CONTAINER` colmun and `docker stats byid` will display
the id in the `CONTAINER` column) but adds two new format directive.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 07f77b78ea
Component: cli
2016-11-03 07:20:46 +01:00
Vincent Demeester 962c73e2cf Add support for Names and ID in stats format
This adds support to display names or id of container instead of what
was provided in the request.

This keeps the default behavior (`docker stats byname` will display
`byname` in the `CONTAINER` colmun and `docker stats byid` will display
the id in the `CONTAINER` column) but adds two new format directive.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ef915fd036d9ea5263f9370dce490ef97ea0618d
Component: engine
2016-11-03 07:20:46 +01:00
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
yuexiao-wang 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
Sebastiaan van Stijn 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
Brian Goff 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
John Howard 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Brian Goff 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
Sebastiaan van Stijn a513733757 Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
add replicated in service scale command description
Upstream-commit: e279ecacc5
Component: cli
2016-11-02 18:01:59 -07:00
Sebastiaan van Stijn 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
Victor Vieux 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
Justin Cormack 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
Derek McGowan 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
Sebastiaan van Stijn 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
Misty Stanley-Jones 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
Victor Vieux 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