Commit graph

26676 commits

Author SHA1 Message Date
Vincent Demeester
09b929083d Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
2016-08-19 22:09:57 +02:00
Sebastiaan van Stijn
80798d28d3 Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken
Modify usage of docker swarm join-token command
2016-08-19 21:44:42 +02:00
Alexander Morozov
bf61c916ee Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs
ppc64le: add support for building docker debs for xenial
2016-08-19 08:35:31 -07:00
Sebastiaan van Stijn
ec8f20cbf2 Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit
Remove -run flag from commit command.
2016-08-19 15:19:23 +02:00
Sebastiaan van Stijn
d6c75c3138 Merge pull request #25799 from vdemeester/25313-integration-no-cover
Disable coverage on test-integration-cli
2016-08-19 14:31:24 +02:00
Justin Cormack
0bf6d4a2df Merge pull request #25858 from cpuguy83/fix_manfile
Use the correct version of glide
2016-08-19 12:44:51 +01:00
Vincent Demeester
54ed156879
Remove -run flag from commit command.
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-19 13:14:03 +02:00
Christopher Jones
64881dc331
ppc64le: add support for building docker debs for xenial
This PR adds the ability to make docker debs for xenial on power

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-08-18 22:25:14 -04:00
lixiaobing10051267
9123ca546a Modify usage of docker swarm join-token command
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-19 09:44:22 +08:00
Yong Tang
7fd2c80962 Update zsh and bash completion scripts.
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-18 18:41:15 -07:00
Yong Tang
6c5c34d50d Add --force in docker volume rm to fix out-of-band volume driver deletion
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).

This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.

Related documentations have been updated.

This fix is tested manually with flocker, as is specified in #23367.
An integration test has also been added for the scenario described.

This fix fixes #23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-18 18:01:25 -07:00
Brian Goff
ce312a910c Use the correct version of glide
In `man/Dockerfile` we are specifying a tagged version of glide to
checkout, but never actually checking it out.
This checks out the requested version before building.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-18 20:43:50 -04:00
Brian Goff
09e1de2080 Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim
Vendor hcsshim to v0.4.2
2016-08-18 17:21:02 -04:00
Brian Goff
5b6063c837 Merge pull request #25841 from anusha-ragunathan/vendor-dist
Vendor distribution changes.
2016-08-18 17:20:03 -04:00
Vincent Demeester
5ec6e11e15
Disable coverage on test-integration-cli
Temporarly remove cover bundle from defaults.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-18 22:12:24 +02:00
Doug Davis
282b0aff08 Merge pull request #24978 from yongtang/24912-build-with-progress
Add hint of progress to the output of `docker build`
2016-08-18 16:10:48 -04:00
Vincent Demeester
426046db3a Merge pull request #25708 from timfeirg/master
expose RemovalInProgress in StateString #25652
2016-08-18 21:54:48 +02:00
Darren Stahl
ba54581c3d Vendor hcsshim to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-18 12:53:01 -07:00
Sebastiaan van Stijn
139bf2c98e Merge pull request #25844 from tiborvass/1.12.1-changelog-to-master
Merge 1.12.1 CHANGELOG to master
2016-08-18 21:14:07 +02:00
Tibor Vass
3b05e95d98 Merge 1.12.1 CHANGELOG to master
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-18 11:35:44 -07:00
Tõnis Tiigi
923053d1ed Merge pull request #25839 from cpuguy83/add_comments
Add requested comments about old buggy behavior
2016-08-18 10:31:37 -07:00
Sebastiaan van Stijn
6fa69d2d06 Merge pull request #25743 from lixiaobing10051267/masterInspect
Check the return message of docker service inspect
2016-08-18 19:25:08 +02:00
Anusha Ragunathan
764d97444e Vendor distribution changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-08-18 09:30:31 -07:00
Sebastiaan van Stijn
88a6a7763b Merge pull request #25726 from vieux/new_plugin_system_doc
adding some documentation about the new plugin system
2016-08-18 17:20:09 +02:00
Sebastiaan van Stijn
90308fd783 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
Specify woker node for docker swarm leave command
2016-08-18 17:08:41 +02:00
Sebastiaan van Stijn
840a198280 Merge pull request #25812 from johananl/patch-1
Update device-mapper-driver.md
2016-08-18 17:08:14 +02:00
Brian Goff
c7075bd149 Add requested comments about old buggy behavior
Address comment: 246d1eb58e (r75242138)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-18 10:07:22 -04:00
Vincent Demeester
d854c4fcc6 Merge pull request #25815 from justincormack/capdoc
Split list of capabilities into those added by default and those not
2016-08-18 15:26:59 +02:00
Vincent Demeester
3cebff8b86 Merge pull request #25785 from WeiZhang555/fix-flaky-external-volume-driver
bugfix: report "destroy" after all volumes of container destroy
2016-08-18 09:58:54 +02:00
timfeirg
37466cc8c8 expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
2016-08-18 11:25:27 +08:00
Tibor Vass
1b954973cc Merge pull request #25825 from cpuguy83/25821_fix_nil_opts
Fix volume not working after daemon restart
2016-08-17 20:15:34 -07:00
Doug Davis
79210b9d5a Merge pull request #25822 from Microsoft/jjh/typo
Fix minor comment typo.
2016-08-17 22:07:36 -04:00
lixiaobing10051267
fd660e21bf Specify woker node for docker swarm leave command
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-18 09:35:11 +08:00
Brian Goff
246d1eb58e Fix volume not working after daemon restart
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.

In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.

Ensures 2 things:

1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.

2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-17 20:36:17 -04:00
John Howard
d56c2ea9ed Fix minor typo
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-17 16:10:01 -07:00
Justin Cormack
b0b3249bc2 Merge pull request #25801 from thaJeztah/improve-volume-validation-message
improve error message for volume names that are too short
2016-08-17 23:33:08 +01:00
Alexander Morozov
a1fece6821 Merge pull request #25808 from justincormack/parallel-tests
Run seccomp tests in series not parallel
2016-08-17 14:50:24 -07:00
Justin Cormack
bf7a3f0104 Split list of capabilities into those added by default and those not
The documentation was a bit unhelpful as to what are the default
capabilities, so split.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 21:16:54 +01:00
Brian Goff
d8e12f8755 Merge pull request #25809 from justincormack/patricia
Update go-patricia to 2.2.6
2016-08-17 15:25:17 -04:00
Johanan Lieberman
086542a687 Update device-mapper-driver.md
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com>
2016-08-17 21:58:30 +03:00
Alexander Morozov
2d93186e00 Merge pull request #25805 from crosbymichael/oci-import-paths
Replace old oci specs import with runtime-specs
2016-08-17 11:07:13 -07:00
Justin Cormack
d16f96262e Update go-patricia to 2.2.6
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 19:02:32 +01:00
Justin Cormack
84ec04306c Run seccomp tests in series not parallel
Fix #24803 as this had been failing sometimes.

As the parallel tests are probably genuine failures, and
had already been cut down, I will re-create these specifically
as a parallel execution test with no seccomp to make the
cause clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-08-17 18:48:06 +01:00
Michael Crosby
041e5a21dc Replace old oci specs import with runtime-specs
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
2ae49a0887 Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format
Add zsh completion for 'docker {network,volume} ls --format'
2016-08-17 16:51:51 +02:00
Sebastiaan van Stijn
b4abe38d43 Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context
Add missing docs about binary remote contexts
2016-08-17 16:43:35 +02:00
Sebastiaan van Stijn
8d5a615045
improve error message for volume names that are too short
this improves the error message if a user tries to
create a volume with a single-character name:

Before this change:

    docker volume create --name a
    Error response from daemon: create a: "a" includes invalid characters for a local volume name, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed

After this change:

    docker volume create --name a
    Error response from daemon: create a: volume name is too short, names should be at least two alphanumeric characters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 16:40:24 +02:00
Sebastiaan van Stijn
a5ba032c74 Add missing docs about binary remote contexts
This feature was added in docker 1.8, through
7491f9a9c1.

However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.

Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268d

This moves the API docs to the correct
versions, and restores the CLI documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-17 16:15:59 +02:00
Phil Estes
3473980a29 Merge pull request #25771 from mrunalp/allow_host_ns_with_user
Allow using --pid=host and --net=host when --userns=host
2016-08-17 09:57:30 -04:00
Sebastiaan van Stijn
2c224e4fc0 Merge pull request #25788 from sdurrheimer/zsh-completion-volumes-ls-filter-label
Add zsh completion for 'docker volume ls --filter label'
2016-08-17 11:11:27 +02:00