Commit graph

32131 commits

Author SHA1 Message Date
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
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
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
Brian Goff
d90fb13de7 Merge pull request #32802 from juliengk/docs_plugin_authz
Update legacy_plugins.md to include HBM authz plugin
2017-04-26 23:09:47 -04:00
Sebastiaan van Stijn
6559abaf47 Merge pull request #31557 from ripcurld0/add_stack_ls
Add the format option to the docker stack ls command
2017-04-26 19:13:33 -07:00
Sebastiaan van Stijn
5704d58cd8 Merge pull request #32870 from thaJeztah/anusha-no-auto-assign
Disable auto-assign for Anusha
2017-04-26 18:55:01 -07:00
Brian Goff
3c5f3fd42b Merge pull request #32834 from Microsoft/gowinio-v0.3.9
Remove go-winio fork - move to v0.3.9
2017-04-26 21:06:39 -04:00
Tõnis Tiigi
22d9eadee2 Merge pull request #32564 from dnephin/compose-file-rel-dir
Set Composefile WorkingDir to dirname of the composefile.
2017-04-26 17:30:33 -07:00
Sebastiaan van Stijn
97d6b2a873
Disable auto-assign for Anusha
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-04-26 17:18:06 -07:00
Daniel Nephin
2414166e1e Create a new ShellLex struct which provides the expected interface to Builder.
Remove b.escapeToken from builder

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-26 19:39:16 -04:00
Tõnis Tiigi
5eca7f7c5d Merge pull request #31856 from jim-minter/more_races
Resolve a set of race conditions in logging and attaching code
2017-04-26 16:04:02 -07:00
Flavio Crisciani
8dc8cd4719
Inroduce SWARM --data-path-addr flag
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)

Negative test added for invalid flag arguments

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-26 15:33:15 -07:00
Flavio Crisciani
b96988feb9
Libnetwork vendoring
Vendor libnetwork changes for --data-path-addr flag

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-26 15:33:13 -07:00
Kenfe-Mickaël Laventure
d4bf6ad716 Merge pull request #32574 from mlaventure/add-ctx-to-df-prune
Add ctx to df and prune
2017-04-26 15:42:08 -05:00
Victor Vieux
30fe330e62 Merge pull request #32852 from moby/change_email
Use personal email address
2017-04-26 12:43:34 -07:00
Arnaud Porterie (icecrime)
54dfc3721c Use personal email address
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2017-04-26 11:59:51 -07:00
Misty Stanley-Jones
94465adaf0 Merge pull request #32831 from jmaitrehenry/patch-2
Clarify where the RUN command runs from
2017-04-26 11:34:00 -07:00
Julien Maitrehenry
3f6e861c14 Clarify where the RUN command runs from
Also, chained/quoted shell does not work

Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com>
2017-04-26 13:54:48 -04:00
Vincent Demeester
4480e0417e Merge pull request #32824 from aaronlehmann/raftquorum-test-bug
Fix incorrect assumption in TestAPISwarmRaftQuorum
2017-04-26 15:14:50 +02:00
Vincent Demeester
08422650be Merge pull request #32829 from aaronlehmann/cli-image-tests-corrections
cli: Correct command/image tests for testify
2017-04-26 11:29:11 +02:00
Kenfe-Mickaël Laventure
e8abe0a69d Merge pull request #32540 from cpuguy83/add_logdrivers_to_info
Add logdrivers to /info
2017-04-25 23:25:30 -05:00
John Howard
d4fb626e36 Merge pull request #32817 from vdemeester/fix-win-it
Fix docker run -it on windows
2017-04-25 20:10:38 -07:00
John Howard
7a3aa2dabe Remove go-winio fork - move to v0.3.9
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-04-25 20:00:47 -07:00
Victor Vieux
f3ff8dc584 Merge pull request #32813 from ehazlett/fix-service-ls-filter
Move service runtime filter to server
2017-04-25 16:38:59 -07:00
Aaron Lehmann
acc2d5b7d6 cli: Correct command/image tests for testify
These tests were caught in the crossfire of the transition to testify.
testify has a few subtle differences from the similar custom framework
it replaced:

- Error behaves differently
- Equal takes its arguments in a different order

This PR also takes the opportunity to use a few shorthands from testify,
such as Len, True, and False.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-25 16:24:07 -07:00
Tonis Tiigi
d1faf3df27 Refactor remote context parsing
Redefine a better interface for remote context dependency.

Separate Dockerfile build instruction from remote context.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-04-25 14:35:31 -07:00
Evan Hazlett
bb30ab9b5f move service runtime filter to server
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-04-25 15:38:46 -04:00
Aaron Lehmann
c27603238c Fix incorrect assumption in TestAPISwarmRaftQuorum
This test shuts down two out of three managers and then asserts that the
swarm has a leader. A swarm that lost quorum won't necessarily have a
leader, and in this case only has one because the old leader is still
around. Soon SwarmKit will be changed so the leader gives up leadership
when quorum is lost. This will avoid confusing situations, like
read-only APIs succeeding, while ones that write to Raft hang.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-25 12:10:12 -07:00
Vincent Demeester
8c014db302 Fix docker run -it on windows
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
2017-04-25 18:25:05 +02:00
Boaz Shuster
205ec49de9 Add format to docker stack ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-04-25 16:45:30 +03:00
Vincent Demeester
e1101b1295 Merge pull request #32470 from runcom/remove-init-client
remove --init-path from client
2017-04-25 10:25:58 +02:00
Vincent Demeester
a3a109d956 Merge pull request #32341 from ripcurld0/tt_rm_ut
Use a test table in the daemon delete unit tests
2017-04-25 10:25:05 +02:00