Commit Graph

31631 Commits

Author SHA1 Message Date
c2ca52e58a Merge pull request #29908 from lixiaobing10051267/masterExpectedErr
optimize Fatalf with the expectedError
Upstream-commit: 766e53d8cb21642ab7ed0cd3f93f6265107ef969
Component: engine
2017-01-05 18:05:08 +09:00
122bb479a3 Merge pull request #29888 from albers/completion-plugin-names
Add bash completion for plugin names
Upstream-commit: 1dad4cf30c7cdccdc04d5d8c5d4ac9f8f729f0f3
Component: engine
2017-01-05 09:54:17 +01:00
092b719cd9 Merge pull request #29903 from Microsoft/jjh/volumetest-tp5
Windows: Fix TP5 volume unit tests TODOs
Upstream-commit: 7ad34996bc88ce13ad4d7fb9b89be57366e75bb0
Component: engine
2017-01-05 09:53:31 +01:00
d5020524c6 Merge pull request #29739 from tonistiigi/add-restart-liverestore-test
Add test TestRestartPolicyWithLiveRestore
Upstream-commit: ec6d322d37d5faf5e46a99dba78809913f6ab0ac
Component: engine
2017-01-05 09:39:07 +01:00
d7d442f89f Merge pull request #29907 from YunxiangHuang/fix_zsh_docker
Fix completion for zsh
Upstream-commit: 6b49da6edb2f40b3618fd68e82bff66508d0c603
Component: engine
2017-01-05 09:34:39 +01:00
16eae482a2 optimize Fatalf with the expectedError
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 63058171849a9b491da2f2c45b476c0d58daa4a7
Component: engine
2017-01-05 14:47:36 +08:00
354a4c397b Merge pull request #29892 from Microsoft/jjh/volcomment
Correct comment in vol driver interface
Upstream-commit: 10eee3dfa7808f8b252fa6a998fc033bd5fd0c83
Component: engine
2017-01-05 13:11:34 +09:00
de1ab35d12 Fix "zsh/_docker"
Signed-off-by: Yunxiang Huang <hyxqshk@vip.qq.com>
Upstream-commit: c6544394b8c5f406ea9054ed7e3e00206c2f0235
Component: engine
2017-01-05 11:13:17 +08:00
75ea28e3b8 Windows: Fix old TP5 volume unit tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: cc3e59c44e997c6c399415d1378072f247129230
Component: engine
2017-01-04 16:17:55 -08:00
55d4d2f410 Windows: Enable TestBuildWorkdirImageCmd
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 528a5fd2ba02ea8d34cc528cddbd1b5b62a30074
Component: engine
2017-01-04 15:33:40 -08:00
5112890bb5 Add .CreatedAt placeholder for docker network ls --format
This fix tries to add a placeholder `.CreatedAt` for Go
format template in `docker network ls --format`.

While working on 29226, I noticed that it is not possible to
display network's creation time in `docker network ls`, with or
without `--format`.

We are able to find the timestamp through `docker network inspect` though.

However, as we allows networks to be pruned based on the timestamp
(see 29226), showing the timestamp in `docker network ls --format`
would be much useful now.

This fix adds the `.CreatedAt` placeholder for `docker network ls --format`.
The default output was not changed for `docker network ls --format`.

A test case for unit tests has been added.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0ad02c610880f7ccb96be418baa8667e41aba7a5
Component: engine
2017-01-04 15:18:44 -08:00
a89bf941cb Merge pull request #29877 from mavenugo/npfilter
Use GetAllByCap to get list of network plugins in docker info
Upstream-commit: 4617b66c90eb54119d54f459f48f873f583731df
Component: engine
2017-01-04 14:57:20 -08:00
0c3b3bfadc 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>
Upstream-commit: 58738cdee327f5de481dcf7d3d377374cbb5f13a
Component: engine
2017-01-04 14:16:42 -08:00
7979981cc5 Add test TestRestartPolicyWithLiveRestore
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 89f034093a771fc1d3d161d23e018c25ae4e2ee3
Component: engine
2017-01-04 14:12:49 -08:00
eb2f639fe6 Use vol plugin creator instead of inserting spec
This makes the test a bit more robust to change and is a bit cleaner.
As implemented before this commit, we have two named plugins pointing to
the same http service. If the daemon makes any unexpected calls to the
plugin (e.g. during startup) we'll get more counts on the event counter
than expected since the daemon sees 2 plugins.

Found this while working on #29877 which broke this test originally (but
is no longer using V1 plugins, so is this is no longer broken there) and
took some time to debug what was going on.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4bd4d18e1164e1d0b9f22ddd54a88abdf167e8d7
Component: engine
2017-01-04 15:51:49 -05:00
6ff3e9dd6b 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>
Upstream-commit: 6aaa85f0b0dd030f68512ca9004823926419f5fd
Component: engine
2017-01-04 12:38:14 -08:00
5bd9457743 Correct comment in vol driver interface
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2246f28f6bd8f4ebc333cfdb8a9e8ab6d1b7845
Component: engine
2017-01-04 12:06:37 -08:00
a767e74156 Merge pull request #29889 from vieux/small_secret_doc_update
small secret doc update
Upstream-commit: bcf70b309b533269e35ce7b6f2c34c892f5b684d
Component: engine
2017-01-04 11:27:11 -08:00
966dc7a8d7 Merge pull request #29867 from Microsoft/jjh/isolationwording
Docs: Tidy --isolation wording
Upstream-commit: f0a13eb620762fd6a9627de8498b2746586da8bd
Component: engine
2017-01-04 19:32:49 +01:00
8b3646ee75 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>
Upstream-commit: 428600108cce0a11e65ec4ebd9e439e947b55da7
Component: engine
2017-01-04 10:19:04 -08:00
65432d04b8 Add bash completion for plugin names
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e7243a303a9fb982db535b9941b9a60df0be8de5
Component: engine
2017-01-04 09:53:14 -08:00
22fd058892 Extract daemon statsCollector to its own package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 835971c6fdaf6ea35a0e7e45f6d9a09fd5f03ce1
Component: engine
2017-01-04 18:18:30 +01:00
6fad25131b Tidy --isolation wording
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3c32916141f7678e3f0a87fc4de5cb03535a816c
Component: engine
2017-01-04 09:14:10 -08:00
a6c6e5f892 fix volume ls filter driver
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0fdab496108e8d0945af3dd0130dd9deb09c9b26
Component: engine
2017-01-04 23:29:12 +08:00
8965c03605 Merge pull request #29861 from Microsoft/jjh/tidywinkv
Tidy kernel version in tests
Upstream-commit: 03c17ab66a3d1adc2e6c3e0ac436afe43bcfd3b1
Component: engine
2017-01-04 15:48:20 +01:00
85a740c504 Merge pull request #29650 from allencloud/support-registry-mirror-config-reload
support registry mirror config reload
Upstream-commit: d3f30d6a67577a52162b36a1af13eb4167e48c6b
Component: engine
2017-01-04 13:46:19 +01:00
47aebadce2 keep network option consistent between network connect and run
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4f9b076e8eecb19083b3875b7cacbc3b660fde75
Component: engine
2017-01-04 19:54:03 +08:00
548c0ae5fe Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
Update docker daemon to dockerd
Upstream-commit: 6129e6ce3ebd1bd6c9db76e196248c613fda6e40
Component: engine
2017-01-04 11:55:38 +01:00
1f42780a09 Should check for output, not error in deleteContainer
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b029d3dee36d2d3c51b66557b4f03e493fe45fee
Component: engine
2017-01-04 11:15:36 +01:00
b452e40ef4 small secret doc update
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 91b739b55246a74f92e537c2c03ec94a50797184
Component: engine
2017-01-03 23:13:31 -08:00
e7cd6e9e80 support registry mirror config reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5b9348c553d183bc62f6e7cc8f934766fac162bd
Component: engine
2017-01-04 11:04:00 +08:00
e5d82b6a00 Merge pull request #29431 from vieux/update_plugin_examples
replace no-remove by sample-volume-plugin in docs
Upstream-commit: 355f2ae972cc6b5070d14c16113bc9da076561d4
Component: engine
2017-01-03 18:05:44 -08:00
25dd6a8c20 Merge pull request #29733 from cpuguy83/fix_v1plugin_deadlock
Fix race/deadlock in v1 plugin handlers
Upstream-commit: 48ed4f0639d2f290603a04ec146beb3f9569280f
Component: engine
2017-01-03 17:02:15 -08:00
17d62dfc95 replace no-remove by sample-volume-plugin in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: bcead9282e17f51b01c4edfa59221546f02aaa33
Component: engine
2017-01-03 16:03:48 -08:00
ad9d96a397 Merge pull request #29862 from dnephin/strip-quotes-from-args
Trim quotes from tls flag values
Upstream-commit: 8e64ca31f2822eb5d11e4b14de59ed3555ef21a1
Component: engine
2017-01-03 15:21:19 -08:00
59c3c898d1 Merge pull request #29852 from thaJeztah/bump-go-units
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Upstream-commit: 59f6f6bc0173a0ffbaac001e07c40de18af9def4
Component: engine
2017-01-04 07:54:45 +09:00
6019fc383c Windows to Linux build warning to stdout
Signed-off-by: John Howard <jhoward@microsoft.com>

When building a Dockerfile from a Windows client on a Linux daemon, a
"security warning" is printed
on stderr. Having this warning printed on stderr makes it difficult to
distinguish a failed build from one that's succeeding, and the only way to
suppress the warning is through the -q option, which also suppresses every
output. This change prints the warning on stdout, instead of stderr, to
resolve this situation.
Upstream-commit: d45c652e8393416d5a00eaa8864223b786c4182e
Component: engine
2017-01-03 14:07:50 -08:00
cb7b1468a9 Merge pull request #29789 from miaoyq/optimization-error-description
Optimization a error description
Upstream-commit: ef9935ce8f4acf5d53db0a2f9621f9135aed442b
Component: engine
2017-01-03 13:01:22 -08:00
77a99bbc10 Trim quotes from TLS flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: abe32de6b46825300f612864e6b4c98606a5bb0e
Component: engine
2017-01-03 15:58:41 -05:00
ecc03f8a8a Tidy kernel version in tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b06692b1a94572cd60ca066efc85107b629f30f1
Component: engine
2017-01-03 12:47:25 -08:00
91215c83ce Docs: Be more clear when specifying valid formats for strings
- Use the word letter rather than character to refer to letters ;) when trying to specify that only letters and numbers can be used, and not ANY character...
- Small corrections

Fixes #29821

Signed-off-by: Timothy Hobbs <timothy@hobbs.cz>
Upstream-commit: b71b4e1fb9aac5215aff7ce87e1bbb4010054ecd
Component: engine
2017-01-03 21:40:50 +01:00
4224f41161 Add quoted string flag Value.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e4c1f0772923c3069ce14a82d445cd55af3382bc
Component: engine
2017-01-03 15:09:54 -05:00
cee6d6487a Merge pull request #29556 from mavenugo/refcount
Fixing a couple of network plugin life-cycle mgmt issues
Upstream-commit: 2ef6d8045415899b3faf8b68c0c732aa8c18917d
Component: engine
2017-01-03 11:13:22 -08:00
70eb9ee7f4 Extract the daemon image cache to its own package
ImageCache is now independent of `Daemon` and is located in
`image/cache` package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: be1df1ee1302cffe9825a23c05b5ebde3c6da254
Component: engine
2017-01-03 19:19:27 +01:00
e9e565840f Merge pull request #29843 from YuPengZTE/devVet
fix syscall.GUID composite literal uses unkeyed fields
Upstream-commit: d1ef47b41003060a5f4d9093b9cd4c778f98b297
Component: engine
2017-01-03 19:12:32 +01:00
65fe131f80 bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0e16b5cb3adc16898aae7e1ed532a588b3ef2c95
Component: engine
2017-01-03 18:43:25 +01:00
0cb4581486 Merge pull request #26830 from dnephin/man-desc-in-files
Move the command description to a markdown file for man pages
Upstream-commit: e4223e33617b9964ea5ecc5a4782171eea7b35d6
Component: engine
2017-01-03 17:47:49 +01:00
2678d8d52e Set expected response headers for Ping.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 17f9f5abf4cdf72ce6b5f8f2f69e5a872c6a3b56
Component: engine
2017-01-03 11:47:47 -05:00
f43a9bc718 Convert ContainerTopOKResponse from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 16bdbaaa3357dc1be7d74a283a3ed8d0d861a461
Component: engine
2017-01-03 11:47:47 -05:00
39aeb042a4 Generate GraphDriver from spec, and fix up image spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8d5f558de016814ab3629bd0b5b7cc5fd98805b3
Component: engine
2017-01-03 11:47:47 -05:00