Граф коммитов

32222 Коммитов

Автор SHA1 Сообщение Дата
David Sheets 84812f3f00 docs/dockerd: correct authz plugin chain semantics
Signed-off-by: David Sheets <dsheets@docker.com>
2017-05-01 15:18:42 +01:00
Doug Davis f9f66f946f Merge pull request #32941 from ryancooper7/patch-1
Minor grammatical fix
2017-05-01 05:41:47 -04:00
ryancooper7 5cd75dd14c 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>
2017-05-01 03:30:27 -06:00
Vincent Demeester 4219156a62 Merge pull request #32687 from runcom/oci-selinux
Switch to using opencontainers/selinux for selinux bindings
2017-04-29 19:05:32 +02:00
Sebastiaan van Stijn 42636920d3 Merge pull request #32908 from yuexiao-wang/fix-plugin-typos
fix some typos for plugin
2017-04-28 19:09:23 -07:00
Tibor Vass 30221cc521 Merge pull request #32902 from fcrisciani/memberlist_bump
Vendoring memberlist tag 0.1.0
2017-04-28 18:42:21 -07:00
Sebastiaan van Stijn 6d7ae1fa0b Merge pull request #32894 from davidxia/patch1
[docs] Add missing Name field to NetworkContainer object
2017-04-28 18:28:31 -07:00
Sebastiaan van Stijn f1571e8b67 Merge pull request #32516 from thaJeztah/deprecate-async-service-commands
Deprecate "asynchronous" service create and service update
2017-04-28 16:08:38 -07:00
Sebastiaan van Stijn cc9dc643ea Merge pull request #32888 from denis-soundcloud/clarify-env-file-without-value
Clarify --env-file usage with names without values
2017-04-28 16:03:24 -07:00
Sebastiaan van Stijn f0bb1d7a4a Merge pull request #32920 from fcrisciani/remote_addr
Change GetRemoteAddress to return an IP list
2017-04-28 15:42:21 -07:00
Daniel Nephin 80543b2601 Merge pull request #32921 from dnephin/revert-exclude-builtin-from-history
Fix cache miss when builtin build args are used
2017-04-28 18:15:18 -04:00
Flavio Crisciani 44c3de8450
Libnetwork vendoring
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-28 13:17:44 -07:00
Flavio Crisciani 441e861095
Change GetRemoteAddr to return all managers
Respect the new provider interface

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-28 13:17:34 -07:00
Daniel Nephin 721e1736ae Fix cache miss when builtin build args are used.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 12:49:50 -04:00
yuexiao-wang 6353f993d9 fix some typos for plugin
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-04-28 23:47:45 +08:00
Brian Goff 52bded9868 Merge pull request #32805 from daehyeok/refactoring
Remove unnecessary line
2017-04-28 11:22:59 -04:00
Brian Goff ec67cea96e Merge pull request #32772 from dnephin/refactor-builder-split-commit
[Builder] Refactor `Builder.commit()`
2017-04-28 11:18:55 -04:00
Brian Goff 25058d9b0c Merge pull request #32828 from cyli/external-ca-cert
Add the `CACert` parameter to the `ExternalCA` object
2017-04-28 10:30:57 -04:00
Brian Goff 9f0ebea335 Merge pull request #32763 from dave-tucker/fix-32744
builder: Make builtin arg pruning work with > 1 arg
2017-04-28 10:24:13 -04:00
Doug Davis 9b4bbaf121 Merge pull request #32910 from friism/patch-11
fix typo in plugins_logging.md
2017-04-28 09:34:39 -04:00
Brian Goff eaae8a9a9c Merge pull request #32851 from rhvgoyal/volume-propagation
Volumes should have default propagation property "rprivate"
2017-04-28 08:58:10 -04:00
Denis Defreyne ebe0a489a5
Clarify --env-file usage with names without values
Signed-off-by: Denis Defreyne <denis@soundcloud.com>
2017-04-28 09:03:40 +02:00
Michael Friis 3875305284 fix typo in plugins_logging.md
Signed-off-by: Michael Friis <friism@gmail.com>
2017-04-27 21:29:36 -07:00
Brian Goff 9752e41fd0 Merge pull request #32653 from allencloud/add-empty-string-for-restartpolicy-in-swagger
add empty string for restart policy in swagger.yml
2017-04-28 00:03:09 -04:00
Brian Goff a7519152d9 Merge pull request #32504 from dongluochen/healthcheck_duration
do not allow duration less than 1 ms in healthcheck parameters
2017-04-27 23:54:00 -04:00
yupengzte 5794008b68 delete ineffectual assignment
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-04-28 11:26:38 +08:00
Daniel Nephin 0d9e66b98a 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>
2017-04-27 20:49:38 -04:00
Brian Goff eabee4d47b Merge pull request #32327 from cpuguy83/fix_volumerm_mounted
Ensure unmount before removing local volume
2017-04-27 20:31:11 -04:00
Sebastiaan van Stijn 68a5336b61 Merge pull request #32882 from albers/completion-stack-ls--format
Add bash completion for `stack ls --format`
2017-04-27 15:13:05 -07:00
Sebastiaan van Stijn 294c9eab56 Merge pull request #32884 from albers/completion-system-df--format
Add bash completion for `system df --format`
2017-04-27 15:10:17 -07:00
Sebastiaan van Stijn dc329d38ad Merge pull request #32889 from yuexiao-wang/fix-config
fix errors in config
2017-04-27 15:04:07 -07:00
Brian Goff db3576f8a0 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>
2017-04-27 16:41:03 -04:00
Brian Goff ccc1324b59 Merge pull request #31391 from cpuguy83/fix_volume_unmount_disconnected_fs
Use lazy unmount for local volume driver unmount
2017-04-27 16:22:58 -04:00
Flavio Crisciani 01fd4e49c3
Vendoring memberlist tag 0.1.0
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-27 13:21:35 -07:00
Brian Goff cfae6278be Merge pull request #32897 from crosbymichael/unix-group
Don't error with empty group
2017-04-27 15:50:21 -04:00
yuexiao-wang 25db82371e fix errors in config
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-04-28 01:59:39 +08:00
Brian Goff 420b67f892 Merge pull request #32896 from albers/completion-attach
Add missing bash completion for `docker attach`
2017-04-27 13:57:27 -04:00
Brian Goff 6b5a02e95c Merge pull request #32887 from albers/completion-remove--init-path
Remove bash completion for `run|create --init-path`
2017-04-27 13:53:47 -04:00
Sebastiaan van Stijn 2881e2be58 Merge pull request #32883 from albers/completion-history--format
Add bash completion for `history --format`
2017-04-27 10:51:12 -07:00
Daniel Nephin aee2da3bdf Merge pull request #32858 from dnephin/builder-shell-words-interface
[Builder] Remove b.escapeToken, create ShellLex
2017-04-27 13:16:40 -04:00
Brian Goff 0307fe1a0b Merge pull request #32717 from fcrisciani/data_path
Data path traffic separation option in swarm mode
2017-04-27 13:00:55 -04:00
Michael Crosby 169c013911 Don't error with empty group
Don't error if no group is specified, as this was the prior API.  Also
don't return a docker specific error message as this is in `/pkg` and
used by other projects.  Just set the default group for the current
user/group consuming the package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-27 09:26:21 -07:00
Brian Goff ae0f8c7ba1 Merge pull request #31984 from tonistiigi/remote-context
builder: Refactor remote context
2017-04-27 11:50:18 -04:00
Harald Albers afbd5a79ca Add missing bash completion for `docker attach`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-27 16:59:32 +02:00
David Xia eda3ab9394
Add missing Name field to NetworkContainer object
See https://github.com/spotify/docker-client/issues/730

Signed-off-by: David Xia <dxia@spotify.com>
2017-04-27 10:33:19 -04:00
Brian Goff acbfe6bc56 Use lazy unmount for local volume driver unmount
This fixes issues where the underlying filesystem may be disconnected and
attempting to unmount may cause a hang.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-04-27 08:43:43 -04:00
Harald Albers b7a32e1780 Remove bash completion for `run|create --init-path`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-27 11:02:33 +02:00
Harald Albers 69a2ca0d44 Add bash completion for `system df --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-27 10:29:19 +02:00
Harald Albers c3e161fb52 Add bash completion for `history --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-27 10:18:55 +02:00
Harald Albers b065ed3ec2 Add bash completion for `stack ls --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-27 10:01:17 +02:00