beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32179 commits 14 branches 412 tags 338 MiB
Commit graph

32179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
4f522580f5
Move "labels" to compose 3.3 format 
Commit bb5dfdb8c5 added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-02 13:35:48 -07:00
Sebastiaan van Stijn
fa54c94b9d Merge pull request #32953 from vieux/reports 
Add dev report for may 1st
 2017-05-02 10:41:31 -07:00
Victor Vieux
67ac02d4a6 Add dev report for may 1st 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-05-02 10:23:56 -07:00
Sebastiaan van Stijn
0fe924ad98 Merge pull request #32961 from ijc25/re-vndr 
Update to latest vndr c56e08229111
 2017-05-02 09:51:57 -07:00
Vincent Demeester
1d0b921d70 Merge pull request #32937 from dsheets/daemon-info-authz-dont-sort 
daemon/info: don't sort authorization plugins as order matters
 2017-05-02 14:10:59 +02:00
Vincent Demeester
1504d51701 Merge pull request #32843 from ehazlett/stack-service-filter 
Remove service runtime filter in stack command
 2017-05-02 14:10:20 +02:00
Ian Campbell
a28d91349e 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>
 2017-05-02 11:23:36 +01:00
David Sheets
cfcf2a0cec 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>
 2017-05-02 09:39:32 +01:00
Daniel Nephin
73abe0c682 Merge pull request #32610 from dnephin/builder-move-tag-and-squash 
Extract squash and tagging from the Dockerfile builder
 2017-05-01 18:25:36 -04:00
Daniel Nephin
0296797f0f 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>
 2017-05-01 12:07:32 -04:00
Daniel Nephin
f07811f766 Vendor syncmap 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-01 11:49:43 -04: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
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