Commit graph

29322 commits

Author SHA1 Message Date
Victor Vieux
d75f5178f8 Merge pull request #28537 from YuPengZTE/devTypo
Fix the typo
2016-11-16 23:49:52 -08:00
yupeng
9551dd03cf Fix the typo
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-17 14:13:38 +08:00
allencloud
7777557a3a remove unused error ErrPendingSwarmExists
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-17 14:06:08 +08:00
cizixs
e99e694502 Fix 1.13.0 changelog typo
Signed-off-by: wei wu <wuwei4455@gmail.com>
2016-11-17 12:24:44 +08:00
Brian Goff
36d6d76a41 Use WaitWithContext for WaitStop
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-16 22:08:37 -05:00
Stephen J Day
3484e02590
api/server/httputils: ensure consistent status code
Error code resolution is powered by string matching. Not the greatest
thing in the world and I hope no one is proud of this code, but it
works. However, because a map is used, the iteration order of the map is
random, such that if an error matches two of the snippets, it may return
a different error code depending on the seed of the hashmap. This change
converts it to use a slice instead.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-11-16 18:58:55 -08:00
He Xin
19bd1cee23 fix bugs 'fatal error: concurrent map read and map write' to change VolumeStore.globalLock type from Mutex to RWMutex, and add globalLock.RLock() for the read of names, refs, labels and options in VolumeStore
Signed-off-by: He Xin <he_xinworld@126.com>
2016-11-17 10:48:19 +08:00
Andrea Luzzardi
fbe8790759 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-16 18:15:15 -08:00
Qiang Huang
a532ff8cc3 Add make deb support for aarch64
Fixes: #27045

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-11-17 09:38:17 +08:00
Yong Tang
b6857e91c1 Fix crash caused by docker service inspect --pretty
This fix tries to fix the crash caused by `docker service inspect --pretty`,
by performing necessary nil pointer check.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-16 17:26:03 -08:00
Victor Vieux
956ff8f773 Merge pull request #28505 from Microsoft/jjh/revert27884
Windows: Revert 27884
2016-11-16 17:12:19 -08:00
Sebastiaan van Stijn
a5dce0cb1a Merge pull request #28100 from nwt/disable-v1-protocol-for-default-registry
Disable v1 protocol for the default registry
2016-11-17 01:25:31 +01:00
Aaron Lehmann
d8b8b12994 api: Remove omitempty tag on Parallelism
It doesn't make sense to use omitempty here. 0 is a meaningful value and
it's different from the default. If someone sets Parallelism to 0, we
want to show that Parallelism is 0, not hide the field.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-16 16:21:25 -08:00
Victor Vieux
bb845dbd42 Merge pull request #28501 from tonistiigi/fix-daemon-cmd
Skip cli initialization for daemon command
2016-11-16 15:37:43 -08:00
Sebastiaan van Stijn
3f9dc02135 Merge pull request #28322 from Microsoft/jjh/api1.26
Bump API to v1.26
2016-11-17 00:01:46 +01:00
Victor Vieux
895bf6b053 Merge pull request #27749 from riyazdf/plugin-doc-edits
Edits to plugin docs after building authz plugin
2016-11-16 15:01:16 -08:00
Anusha Ragunathan
1144f8f1d4 Cleanup after plugin install.
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-16 14:45:51 -08:00
John Howard
7e03ce3f13 Windows: Revert 27884
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-16 13:38:45 -08:00
Anusha Ragunathan
5659296f15 Merge pull request #28457 from vieux/proper_error_plugin_windows
explicitly show plugins as unsupported on !linux
2016-11-16 13:36:21 -08:00
Vivek Goyal
f7f3d34210 Move CreateRWLayer() parameters in a struct
Move some of the optional parameters of CreateRWLayer() in a struct
called CreateRWLayerOpts. This will make it easy to add more options
arguments without having to change signature of CreateRWLayer().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2016-11-16 16:31:23 -05:00
Yong Tang
312cc7eebd Use map[string]bool for preProcessor to ignore unknwon field
This fix is an attempt to address the issue raised in 28339. In
`docker ps`, the formatter needs to expose all fields of `types.Container`
to `preProcessor` so that template could be executed.

This direct exposing is unreliable and could cause issues as user may incorrectly
assume all fields in `types.Container` will be available for templating.

However, the purpose of `preProcessor` is to only find out if `.Size`
is defined (so that opts.size could be set accordingly).

This fix defines `preProcessor` as `map[string]bool` with a func `Size()`.
In this way, any unknown fields will be ignored.

This fix adds several test cases to the existing `TestBuildContainerListOptions`.

This fix fixes 28339.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-16 13:23:47 -08:00
Tonis Tiigi
5b0a52f7dc Skip cli initialization for daemon command
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-16 13:19:45 -08:00
Victor Vieux
77fca662dd Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack
Remove old Windows hack in make.sh
2016-11-16 11:38:19 -08:00
Riyaz Faizullabhoy
a524c135dc Edits to plugin docs after building authz plugin
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-11-16 09:53:23 -08:00
Michael Crosby
1c29c3a54d Merge pull request #28420 from vieux/update_tini
update tini to a87614212b3a51a9cad57ff7989103a841546745
2016-11-16 09:46:11 -08:00
John Howard
5e6f8cb4a7 Remove old Windows hack in make.sh
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-16 09:29:38 -08:00
Vincent Demeester
673c5ee559 Merge pull request #27631 from allencloud/get-node-brefore-update
allow node update API to receive node name and id prefix
2016-11-16 17:47:31 +01:00
Doug Davis
4dff538118 Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement
Remove redundant 'if' statement
2016-11-16 11:34:40 -05:00
Vincent Demeester
9057294e4c Merge pull request #28475 from vdemeester/update-stats-reference
Update stats cli reference documentation
2016-11-16 17:25:52 +01:00
Vincent Demeester
947464e2f1
Update stats cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-16 15:26:29 +01:00
Justin Cormack
4549e9104c Merge pull request #28440 from cpuguy83/20740_fix_tmpfs_parsing_on_client
Don't validate platform-dep tmpfs opts on client
2016-11-16 12:04:14 +00:00
Sebastiaan van Stijn
297f2fd445 Merge pull request #28346 from yongtang/11122016-docs-api-version
Fix missing versions in example requests of api docs
2016-11-16 12:15:05 +01:00
Vincent Demeester
cd2d52b5f6 Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
Update docs for `docker info` for most recent changes.
2016-11-16 12:08:35 +01:00
Vincent Demeester
d60cb82ca5 Merge pull request #28471 from lixiaobing10051267/masterLogGroupName
function TestCreateSuccess uses a wrong variable LogGroupName
2016-11-16 12:06:15 +01:00
Vincent Demeester
cec2dffd50 Merge pull request #28468 from sdurrheimer/zsh-completion-system-df
Add zsh completion for 'docker system df'
2016-11-16 12:05:49 +01:00
Yanqiang Miao
d63dc45f0b Remove redundant 'if' statement
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-16 16:50:54 +08:00
lixiaobing10051267
320c93824b function TestCreateSuccess uses a wrong variable LogGroupName
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-16 16:48:36 +08:00
Steve Durrheimer
70fdbff5f0
Add zsh completion for 'docker system df'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-16 08:39:21 +01:00
Yanqiang Miao
c44c542d95 The type of 'ExportdPorts' should be 'nat.PortSet'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-16 13:36:11 +08:00
Tonis Tiigi
89b1234737 Fix deadlock on cancelling healthcheck
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-15 20:10:16 -08:00
Tõnis Tiigi
6697fa8a68 Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
Using distribution reference pkg (pin image by digest)
2016-11-15 20:05:26 -08:00
allencloud
d075b83dd6 allow node update api receive node name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 10:18:19 +08:00
Yong Tang
d22ac2f3a0 Fix error messages for --cpus from daemon
This fix fixes error messages for `--cpus` from daemon.

When `docker run` takes `--cpus`, it will translate into NanoCPUs
and pass the value to daemon. The `NanoCPU` is not visible to the user.
The error message generated from daemon used 'NanoCPU' which may cause
some confusion to the user.

This fix fixes this issue by returning the error in CPUs instead.

This fix fixes 28456.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-15 17:16:09 -08:00
Victor Vieux
ff2de8dace Merge pull request #28444 from allencloud/move-getNetwork-func-into-helper-gofile
move func getNetwork into helper.go to keep consistent
2016-11-15 17:03:23 -08:00
Victor Vieux
a8139460ff explicitly show plugins as unsupported on !linux
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-15 16:47:30 -08:00
Sebastiaan van Stijn
b35973ffe8 Merge pull request #28272 from Microsoft/jjh/sequentialscan2
Windows: Perf: Use sequential file access
2016-11-16 00:47:19 +01:00
Nishant Totla
dc1b6341b9
Refactoring code for pinning image by digest
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-15 13:54:47 -08:00
Sebastiaan van Stijn
5f577bfa6b Merge pull request #28453 from thaJeztah/revert-docs-for-ambient-capabilities
Revert reference docs for ambient capabilities
2016-11-15 22:31:06 +01:00
Sebastiaan van Stijn
d341bb1b6e
Revert reference docs for ambient capabilities
This feature was reverted for docker 1.13
in c5251f7116,
so removing the documentation as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-15 21:59:21 +01:00
Alexander Morozov
27c20a7ea0 Merge pull request #28436 from vdemeester/incremental-build-by-default
Build docker incrementally by default
2016-11-15 09:55:43 -08:00