Commit graph

30308 commits

Author SHA1 Message Date
Akihiro Suda
766e53d8cb Merge pull request #29908 from lixiaobing10051267/masterExpectedErr
optimize Fatalf with the expectedError
2017-01-05 18:05:08 +09:00
Vincent Demeester
1dad4cf30c Merge pull request #29888 from albers/completion-plugin-names
Add bash completion for plugin names
2017-01-05 09:54:17 +01:00
Vincent Demeester
7ad34996bc Merge pull request #29903 from Microsoft/jjh/volumetest-tp5
Windows: Fix TP5 volume unit tests TODOs
2017-01-05 09:53:31 +01:00
Vincent Demeester
ec6d322d37 Merge pull request #29739 from tonistiigi/add-restart-liverestore-test
Add test TestRestartPolicyWithLiveRestore
2017-01-05 09:39:07 +01:00
Vincent Demeester
6b49da6edb Merge pull request #29907 from YunxiangHuang/fix_zsh_docker
Fix completion for zsh
2017-01-05 09:34:39 +01:00
lixiaobing10051267
6305817184 optimize Fatalf with the expectedError
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-01-05 14:47:36 +08:00
Akihiro Suda
10eee3dfa7 Merge pull request #29892 from Microsoft/jjh/volcomment
Correct comment in vol driver interface
2017-01-05 13:11:34 +09:00
Yunxiang Huang
c6544394b8 Fix "zsh/_docker"
Signed-off-by: Yunxiang Huang <hyxqshk@vip.qq.com>
2017-01-05 11:13:17 +08:00
John Howard
cc3e59c44e Windows: Fix old TP5 volume unit tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-04 16:17:55 -08:00
John Howard
528a5fd2ba Windows: Enable TestBuildWorkdirImageCmd
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-04 15:33:40 -08:00
Tibor Vass
4617b66c90 Merge pull request #29877 from mavenugo/npfilter
Use GetAllByCap to get list of network plugins in docker info
2017-01-04 14:57:20 -08:00
Yong Tang
58738cdee3 Add --filter until=<timestamp> for docker container/image prune
This fix is a follow up for comment
https://github.com/docker/docker/pull/28535#issuecomment-263215225

This fix provides `--filter until=<timestamp>` for `docker container/image prune`.

This fix adds `--filter until=<timestamp>` to `docker container/image prune`
so that it is possible to specify a timestamp and prune those containers/images
that are earlier than the timestamp.

Related docs has been updated

Several integration tests have been added to cover changes.

This fix fixes #28497.

This fix is related to #28535.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-04 14:16:42 -08:00
Tonis Tiigi
89f034093a Add test TestRestartPolicyWithLiveRestore
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-04 14:12:49 -08:00
Madhu Venugopal
6aaa85f0b0 Swarmkit has enabled the plugin filtering logic based on the drivers
returned in "docker info". Currently info endpoint isnt using the
GetAllByCap, but relies on existing networks to get the plugin names.
This causes a basic issue when it comes to global network plugins which
swarm-mode relies on, wherein swarmkit will not be able to schedule the
network on the worker nodes due to the filtering logic.

In order to break this chicken & egg issue, we must start to use the
GetAllManagedPluginsByCap. We are unable to use GetAllByCap due to
various issues with Plugin-V1's lazy loading approach causing issues
especially during daemon restarts (which uses SystemInfo)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-01-04 12:38:14 -08:00
John Howard
c2246f28f6 Correct comment in vol driver interface
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-04 12:06:37 -08:00
Victor Vieux
bcf70b309b Merge pull request #29889 from vieux/small_secret_doc_update
small secret doc update
2017-01-04 11:27:11 -08:00
Sebastiaan van Stijn
f0a13eb620 Merge pull request #29867 from Microsoft/jjh/isolationwording
Docs: Tidy --isolation wording
2017-01-04 19:32:49 +01:00
Aaron Lehmann
428600108c plugingetter: Avoid all caps for constant declarations
Go style calls for mixed caps instead of all caps:
https://golang.org/doc/effective_go.html#mixed-caps

Change LOOKUP, ACQUIRE, and RELEASE to Lookup, Acquire, and Release.

This vendors a fork of libnetwork for now, to deal with a cyclic
dependency issue. The change will be upstream to libnetwork once this is
merged.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-04 10:19:04 -08:00
Harald Albers
e7243a303a Add bash completion for plugin names
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-04 09:53:14 -08:00
John Howard
3c32916141 Tidy --isolation wording
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-04 09:14:10 -08:00
allencloud
0fdab49610 fix volume ls filter driver
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-04 23:29:12 +08:00
Vincent Demeester
03c17ab66a Merge pull request #29861 from Microsoft/jjh/tidywinkv
Tidy kernel version in tests
2017-01-04 15:48:20 +01:00
Sebastiaan van Stijn
d3f30d6a67 Merge pull request #29650 from allencloud/support-registry-mirror-config-reload
support registry mirror config reload
2017-01-04 13:46:19 +01:00
yuexiao-wang
4f9b076e8e keep network option consistent between network connect and run
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-01-04 19:54:03 +08:00
Vincent Demeester
6129e6ce3e Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
Update docker daemon to dockerd
2017-01-04 11:55:38 +01:00
Vincent Demeester
b029d3dee3
Should check for output, not error in deleteContainer
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-04 11:15:36 +01:00
Victor Vieux
91b739b552 small secret doc update
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-03 23:13:31 -08:00
allencloud
5b9348c553 support registry mirror config reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-04 11:04:00 +08:00
Victor Vieux
355f2ae972 Merge pull request #29431 from vieux/update_plugin_examples
replace no-remove by sample-volume-plugin in docs
2017-01-03 18:05:44 -08:00
Tibor Vass
48ed4f0639 Merge pull request #29733 from cpuguy83/fix_v1plugin_deadlock
Fix race/deadlock in v1 plugin handlers
2017-01-03 17:02:15 -08:00
Victor Vieux
bcead9282e replace no-remove by sample-volume-plugin in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-03 16:03:48 -08:00
Victor Vieux
8e64ca31f2 Merge pull request #29862 from dnephin/strip-quotes-from-args
Trim quotes from tls flag values
2017-01-03 15:21:19 -08:00
Akihiro Suda
59f6f6bc01 Merge pull request #29852 from thaJeztah/bump-go-units
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
2017-01-04 07:54:45 +09:00
Tibor Vass
ef9935ce8f Merge pull request #29789 from miaoyq/optimization-error-description
Optimization a error description
2017-01-03 13:01:22 -08:00
Daniel Nephin
abe32de6b4 Trim quotes from TLS flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-03 15:58:41 -05:00
John Howard
b06692b1a9 Tidy kernel version in tests
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-01-03 12:47:25 -08:00
Daniel Nephin
e4c1f07729 Add quoted string flag Value.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-03 15:09:54 -05:00
Victor Vieux
2ef6d80454 Merge pull request #29556 from mavenugo/refcount
Fixing a couple of network plugin life-cycle mgmt issues
2017-01-03 11:13:22 -08:00
Vincent Demeester
d1ef47b410 Merge pull request #29843 from YuPengZTE/devVet
fix syscall.GUID composite literal uses unkeyed fields
2017-01-03 19:12:32 +01:00
Sebastiaan van Stijn
0e16b5cb3a
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-03 18:43:25 +01:00
Sebastiaan van Stijn
e4223e3361 Merge pull request #26830 from dnephin/man-desc-in-files
Move the command description to a markdown file for man pages
2017-01-03 17:47:49 +01:00
Sebastiaan van Stijn
d6e5032410 Merge pull request #29847 from albers/completion-service-ps-multiple
Support multiple services on bash completion for `docker service ps`
2017-01-03 17:13:07 +01:00
Vincent Demeester
074f6bbe89 Merge pull request #29776 from allencloud/better-plugin-in-docs
update plugins in docs and correct things in index.md
2017-01-03 17:01:56 +01:00
allencloud
6d3e1d2fd2 update plugins in docs and correct things in index.md
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-03 22:34:32 +08:00
Harald Albers
3f5d11c9bf Support multiple services on bash completion for docker service ps
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-03 05:58:13 -08:00
Vincent Demeester
884a1c2263 Merge pull request #29837 from miaoyq/remove-extra-if-statement
Remove the redundant 'if' statements
2017-01-03 12:42:19 +01:00
Vincent Demeester
18265591c2 Merge pull request #25234 from yongtang/25228-service-ps-multiple-ID
Support multiple service IDs on "docker service ps"
2017-01-03 12:40:24 +01:00
Vincent Demeester
d69d4799a3
Add a new request package in integration-cli
The goal is to remove function from `docker_utils.go` and setup
simple, one-responsability package that can be well tested ; and to
ease writing request.

This moves all the calls to `sockRequest` (and similar methods) to
their counterpart in the `request` package.

This introduce `request.Do` to write easier request (with functional
argument to easily augment the request) with some pre-defined function
for the most used http method (i.e. `request.Get`, `request.Post` and
`request.Delete`).

Few of the `sockRequest` call have been moved to `request.Do` (and
`Get`, etc.) to showcase the usage of the package. There is still a
whole lot to do.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-03 11:49:30 +01:00
Vincent Demeester
de709ebfd8 Merge pull request #29827 from vdemeester/integration-fixes-for-userns
Updates some integration tests to fix userns builds
2017-01-03 11:47:39 +01:00
Sebastiaan van Stijn
275d68ab39 Merge pull request #29828 from vdemeester/integration-deleteContainer-ignore-notfound
Do not fail in `TearDown` if container not found when removing
2017-01-03 11:35:07 +01:00