2849edb0ec
fix when rpc reports "transport is closing" error, health check go routine will exit
...
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com >
Upstream-commit: 60742f9a95cb5eff549a873a53724863f1ab20e2
Component: engine
2017-05-04 00:52:10 +08:00
064efbd1ee
Merge pull request #32701 from gschaetz/master
...
Explain why "docker attach" may appear to hang
Upstream-commit: f3dfcfd307d9881cd281b28cd56bb2851472afb3
Component: engine
2017-05-02 18:12:44 -07:00
19938bf754
Update attach.md
...
added some clarification around why attach can appear hung to some. issue #1456 on docs
Signed-off-by: gary schaetz <gary@schaetzkc.com >
Updated the documentation to reflect what happens when you use a fragment in
the docker build url parameter.
Signed-off-by: Gary Schaetz <gary@schaetzkc.com >
added markup for commands
Signed-off-by: Gary Schaetz <gary@schaetzkc.com >
Upstream-commit: a34f9b0bb197674fe2c1c4d3b1b9963e2193071c
Component: engine
2017-05-02 18:09:04 -07:00
b99754c552
Merge pull request #32751 from michaelspets/32748-add-doc
...
add desc for system events [fixes #32748 ]
Upstream-commit: 78448765470a6f686daa31495bf2dc5099bda646
Component: engine
2017-05-02 16:15:51 -07:00
72276b1c4c
Merge pull request #32943 from dsheets/docs-dockerd-fix-authz-chain
...
docs/dockerd: correct authz plugin chain semantics
Upstream-commit: ef20f027cca6a1ec8503a5a96e74e48ef2168760
Component: engine
2017-05-02 15:25:02 -07:00
e4b93d3405
Merge pull request #32953 from vieux/reports
...
Add dev report for may 1st
Upstream-commit: fa54c94b9d70c0582012aaef18991e1fb4dd59ba
Component: engine
2017-05-02 10:41:31 -07:00
693a46809d
Add dev report for may 1st
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 67ac02d4a6c093f9c796dd4ddd1a185bde63b460
Component: engine
2017-05-02 10:23:56 -07:00
f3f1962192
Merge pull request #32961 from ijc25/re-vndr
...
Update to latest vndr c56e08229111
Upstream-commit: 0fe924ad983efc9f772551bcc6e5971b8446ea0a
Component: engine
2017-05-02 09:51:57 -07:00
bd6baf4655
Merge pull request #32937 from dsheets/daemon-info-authz-dont-sort
...
daemon/info: don't sort authorization plugins as order matters
Upstream-commit: 1d0b921d70824c8cc7ae05fe0a6bdf0b49e50816
Component: engine
2017-05-02 14:10:59 +02:00
effaed887f
Merge pull request #32843 from ehazlett/stack-service-filter
...
Remove service runtime filter in stack command
Upstream-commit: 1504d51701fedc867a5504b98598bee43311cd8a
Component: engine
2017-05-02 14:10:20 +02:00
8fded72012
Update to latest vndr c56e08229111
...
Changes are:
$ git log --no-merges --oneline 19220953c4a4..c56e08229111
4b76270 Keep "vendor.conf" for reference
ac8f766 travis: update to go 1.8.1
c196644 Better validation of duplicates
e684d5e check for unused packages at the end
3ed2513 detect default gopath($HOME/go)
c9052f3 fix backtick in readme
0e04f23 Missing installation section in README
Changes to moby are the inclusion of several upstream vendor.conf files and
switching to vendoring the toplevel golang.org/x/sync package rather than the
syncmap sub-package due to:
2017/05/02 11:21:06 WARNING: package golang.org/x/sync/syncmap is not root import, should be golang.org/x/sync
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
Upstream-commit: a28d91349edda7e4e4ecaa5b1e60a238fe515a4d
Component: engine
2017-05-02 11:23:36 +01:00
3f0220808f
daemon/info: don't sort authorization plugins as order matters
...
plugins exist in a chain that composes potentially mutating requests and
responses. This simply reverts the sorting of AuthZ plugins so that the
/info API endpoint returns the internal ordering used for AuthZ composition.
Volume driver plugins are not affected because they are just a set.
Signed-off-by: David Sheets <dsheets@docker.com >
Upstream-commit: cfcf2a0cec8d83c1584020ccaab0c94f5bb6d7d4
Component: engine
2017-05-02 09:39:32 +01:00
3d9fa1821c
Merge pull request #32610 from dnephin/builder-move-tag-and-squash
...
Extract squash and tagging from the Dockerfile builder
Upstream-commit: 73abe0c682a74267edc913bd92b8dcd02a2d788c
Component: engine
2017-05-01 18:25:36 -04:00
3d193f829d
Extract squash and tagging from the Dockerfile builder.
...
Remove pathCache and replace it with syncmap
Cleanup NewBuilder
Create an api/server/backend/build
Extract BuildTagger
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0296797f0f39477d675128c93c1646b3186937ee
Component: engine
2017-05-01 12:07:32 -04:00
dff17659b7
Vendor syncmap
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f07811f7668a931667734fbc6d7bdafce2a2adb3
Component: engine
2017-05-01 11:49:43 -04:00
c430286159
docs/dockerd: correct authz plugin chain semantics
...
Signed-off-by: David Sheets <dsheets@docker.com >
Upstream-commit: 84812f3f0011dabe9f9520a2d42125f804f66ce7
Component: engine
2017-05-01 15:18:42 +01:00
f70edb34f1
Merge pull request #32941 from ryancooper7/patch-1
...
Minor grammatical fix
Upstream-commit: f9f66f946feceb43f88f2f9ffb0a880b56bb48d6
Component: engine
2017-05-01 05:41:47 -04:00
9c221aedcb
Minor grammatical fix
...
Just a small grammatical correction, but it is unnecessary to repeat "to," after the colon, and deleting it makes the format of the list more consistent and readable.
Signed-off-by: Ryan Cooper <ryan.cooper7@gmail.com >
Upstream-commit: 5cd75dd14cd6427470c3812dd7ccc7095a30a243
Component: engine
2017-05-01 03:30:27 -06:00
79f9dd11cc
Merge pull request #32687 from runcom/oci-selinux
...
Switch to using opencontainers/selinux for selinux bindings
Upstream-commit: 4219156a6254bdc7d270f06742037df8e2708a9a
Component: engine
2017-04-29 19:05:32 +02:00
26325c0024
Merge pull request #32908 from yuexiao-wang/fix-plugin-typos
...
fix some typos for plugin
Upstream-commit: 42636920d34e02f9bf58e69b5e0b8e44b5fb097f
Component: engine
2017-04-28 19:09:23 -07:00
cede85c141
Merge pull request #32902 from fcrisciani/memberlist_bump
...
Vendoring memberlist tag 0.1.0
Upstream-commit: 30221cc521234e6f160be3d3f9680abdcd59beab
Component: engine
2017-04-28 18:42:21 -07:00
a016bc7a76
Merge pull request #32894 from davidxia/patch1
...
[docs] Add missing Name field to NetworkContainer object
Upstream-commit: 6d7ae1fa0bb7b2cf2cd9ee9fce2b06cceb3aeb5b
Component: engine
2017-04-28 18:28:31 -07:00
8c18e7684d
Merge pull request #32516 from thaJeztah/deprecate-async-service-commands
...
Deprecate "asynchronous" service create and service update
Upstream-commit: f1571e8b67b4014189e356d20d4f388f0e9e88d3
Component: engine
2017-04-28 16:08:38 -07:00
8f749648eb
Merge pull request #32888 from denis-soundcloud/clarify-env-file-without-value
...
Clarify --env-file usage with names without values
Upstream-commit: cc9dc643eae5e491b64985c4c787de4ce79d5ac3
Component: engine
2017-04-28 16:03:24 -07:00
e2681407bf
Merge pull request #32920 from fcrisciani/remote_addr
...
Change GetRemoteAddress to return an IP list
Upstream-commit: f0bb1d7a4a5bf16b9fff1259742c6baf70858c5f
Component: engine
2017-04-28 15:42:21 -07:00
dfe365a689
Merge pull request #32921 from dnephin/revert-exclude-builtin-from-history
...
Fix cache miss when builtin build args are used
Upstream-commit: 80543b2601e9176bea452dace850734114b8054b
Component: engine
2017-04-28 18:15:18 -04:00
3f5d2b22f9
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 44c3de84506d2346c2ea68e13b94e2e296aa4caf
Component: engine
2017-04-28 13:17:44 -07:00
97277c0233
Change GetRemoteAddr to return all managers
...
Respect the new provider interface
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 441e861095c27cd2fc5e4b5f6dca73adcd8455ea
Component: engine
2017-04-28 13:17:34 -07:00
5d06c101d8
Fix cache miss when builtin build args are used.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 721e1736ae31914902d2c2196aed5f92e1a0982d
Component: engine
2017-04-28 12:49:50 -04:00
5b4b113f26
fix some typos for plugin
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 6353f993d9c5e05ae5cc1c235de7d23cae7c5bd7
Component: engine
2017-04-28 23:47:45 +08:00
25f30c808a
Merge pull request #32805 from daehyeok/refactoring
...
Remove unnecessary line
Upstream-commit: 52bded9868f04ec8f06148506666150b017af238
Component: engine
2017-04-28 11:22:59 -04:00
ad91de1337
Merge pull request #32772 from dnephin/refactor-builder-split-commit
...
[Builder] Refactor `Builder.commit()`
Upstream-commit: ec67cea96e0fd90a7a266e1adac9fe1867c8ae13
Component: engine
2017-04-28 11:18:55 -04:00
8a2cc25685
Merge pull request #32828 from cyli/external-ca-cert
...
Add the `CACert` parameter to the `ExternalCA` object
Upstream-commit: 25058d9b0c1414a0c7fa1aef5dd1766aaf2e1c30
Component: engine
2017-04-28 10:30:57 -04:00
9f6af10310
Merge pull request #32763 from dave-tucker/fix-32744
...
builder: Make builtin arg pruning work with > 1 arg
Upstream-commit: 9f0ebea33579b1c6cec8ae445ac3b21655aa3bcd
Component: engine
2017-04-28 10:24:13 -04:00
8a48c1f61c
Merge pull request #32910 from friism/patch-11
...
fix typo in plugins_logging.md
Upstream-commit: 9b4bbaf1218d8cbfa283472cf0e09eae586a43e2
Component: engine
2017-04-28 09:34:39 -04:00
16a9e0d85d
Merge pull request #32851 from rhvgoyal/volume-propagation
...
Volumes should have default propagation property "rprivate"
Upstream-commit: eaae8a9a9ca2b26ede363f11904a80a26aa1ee77
Component: engine
2017-04-28 08:58:10 -04:00
dd2000929f
Clarify --env-file usage with names without values
...
Signed-off-by: Denis Defreyne <denis@soundcloud.com >
Upstream-commit: ebe0a489a5cc66406345f1aafa0f2f866fd64172
Component: engine
2017-04-28 09:03:40 +02:00
d2502dd75f
fix typo in plugins_logging.md
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 3875305284e6d17874bd31a17fe31621a6a09169
Component: engine
2017-04-27 21:29:36 -07:00
3667e2cbdb
Merge pull request #32653 from allencloud/add-empty-string-for-restartpolicy-in-swagger
...
add empty string for restart policy in swagger.yml
Upstream-commit: 9752e41fd06a46a7d3f3e1c42168dc02df53b81c
Component: engine
2017-04-28 00:03:09 -04:00
b5c88cd04e
Merge pull request #32504 from dongluochen/healthcheck_duration
...
do not allow duration less than 1 ms in healthcheck parameters
Upstream-commit: a7519152d9be7a0dd6941d529ea4b83cf4b7f1d4
Component: engine
2017-04-27 23:54:00 -04:00
f6bbbde171
Extract commitContainer from commit() to separate the distinct branches
...
Remove unused arguments to commit.
This will allow us to remove all the runConfig mutate+revert code that
is scattered around builder dispatchers/internals
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0d9e66b98ac9237b561d9beee5ecfe6a133ffc8f
Component: engine
2017-04-27 20:49:38 -04:00
960c2c726c
Merge pull request #32327 from cpuguy83/fix_volumerm_mounted
...
Ensure unmount before removing local volume
Upstream-commit: eabee4d47bec93a5c180c429a9f8b791364c5876
Component: engine
2017-04-27 20:31:11 -04:00
60079a8d66
Merge pull request #32882 from albers/completion-stack-ls--format
...
Add bash completion for `stack ls --format`
Upstream-commit: 68a5336b61c8b252966b582f0e4d08c6ae0bdb63
Component: engine
2017-04-27 15:13:05 -07:00
d23cd74237
Merge pull request #32884 from albers/completion-system-df--format
...
Add bash completion for `system df --format`
Upstream-commit: 294c9eab56970fa0b106d20560ee1110ea478c5d
Component: engine
2017-04-27 15:10:17 -07:00
a9b3c829ba
Merge pull request #32889 from yuexiao-wang/fix-config
...
fix errors in config
Upstream-commit: dc329d38ad70bd0b21fe7c09d2615f38dfb520dc
Component: engine
2017-04-27 15:04:07 -07:00
1824504fe7
Ensure unmount before removing local volume.
...
When there is an error unmounting a local volume, it is still possible
to call `Remove()` on the volume causing removal of the mounted
resources which is generally not desirable.
This ensures that resources are unmounted before attempting removal.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: db3576f8a08ca70287bd3fdf9b21e162537f9d3a
Component: engine
2017-04-27 16:41:03 -04:00
4554383dcd
Merge pull request #31391 from cpuguy83/fix_volume_unmount_disconnected_fs
...
Use lazy unmount for local volume driver unmount
Upstream-commit: ccc1324b59e5768a3ef0236f112e1af20f7fbd2f
Component: engine
2017-04-27 16:22:58 -04:00
93768aaea3
Vendoring memberlist tag 0.1.0
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 01fd4e49c3cadcca435289279bd600ee6403d67c
Component: engine
2017-04-27 13:21:35 -07:00
521ddefb3a
Merge pull request #32897 from crosbymichael/unix-group
...
Don't error with empty group
Upstream-commit: cfae6278be8091e3b6025deaf0a9e225662a017f
Component: engine
2017-04-27 15:50:21 -04:00
a871092798
fix errors in config
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 25db82371eef40f54e1bd175ef72c479d368a798
Component: engine
2017-04-28 01:59:39 +08:00
