b123ea8afd
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
Upstream-commit: 48c3df015d3118b92032b7bdbf105b5e7617720d
Component: engine
2016-11-22 13:11:37 +01:00
163c2e9b09
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 1e65db4206ba89af24400fbf9047b25ec98cfd02
Component: engine
2016-11-22 09:33:21 +08:00
12ac08ce0b
Merge pull request #28504 from runcom/fix-info-route-secopt
...
api: types: do not remove old SecurityOptions struct
Upstream-commit: 3a6829257e970771a4be99783b93a803946443df
Component: engine
2016-11-21 13:55:07 -08:00
b730897ea7
Merge pull request #28649 from allencloud/judge-locked-before-parsing-key
...
judge manager if locked before parsing key
Upstream-commit: 6e4a3c4546d50558d273f8ead7b8ee42ea9f9f20
Component: engine
2016-11-21 13:33:38 -08:00
f8729bb9ff
Merge pull request #28556 from ehazlett/container-secret-store
...
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
2016-11-21 21:40:01 +01:00
9fec0659ba
judge manager if locked before parsing key
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89100c162b23791b4a64d142a11014257bf61fd0
Component: engine
2016-11-21 16:39:09 +08:00
17bacb4a03
close the file
...
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn >
Upstream-commit: cf3ef262b161f1c3dd61f5689e2853c2e8ec8b70
Component: engine
2016-11-21 19:56:01 +08:00
7b9d298769
Merge pull request #28026 from ripcurld00d/fix_27772
...
Return an empty stats if the container is restarting
Upstream-commit: baa14c0e615393dc3459436052d4d7fc513d7d9a
Component: engine
2016-11-20 21:14:37 +01:00
36b43dcc24
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 514ca09426e5d023753101ffa6ac3a21b0e0efb5
Component: engine
2016-11-19 13:21:16 +01:00
40d5a75060
Merge pull request #28611 from vieux/fix_golint
...
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
2016-11-19 07:16:44 -05:00
a7e03990d9
Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded
...
Use Container.Config.Shell instead of hardcoded…
Upstream-commit: f6f67891be80f40a8f8dd0e9296d56b6882ecc2f
Component: engine
2016-11-18 18:54:36 -08:00
efab471941
Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins
...
Allow graphdriver plugins to use v2
Upstream-commit: eb8fc5dcc3eecc9f645fae8194732747501398da
Component: engine
2016-11-18 18:45:34 -08:00
c148947fe6
fix a few golint errors
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
2016-11-18 18:32:02 -08:00
33ea65e4f5
Allow graphdriver plugins to use v2
...
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.
This moves the initialization up before we create the graph driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 020b051dfb92edcb1e43cee77c881dd3e15481c0
Component: engine
2016-11-18 17:23:59 -05:00
71cdb489af
Merge pull request #28421 from aaronlehmann/digest-pinning-warnings
...
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
2016-11-18 11:33:17 -08:00
5c4a8ff562
Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking
...
judge manager before unlocking
Upstream-commit: eb0fc787e699b20d884c8d0dc23a5392e5aeb1a8
Component: engine
2016-11-18 11:27:48 -08:00
8d6fcf9749
lint fixes
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: eb036ea4db86c98d5b3f51e7d0d2424faaca0343
Component: engine
2016-11-18 13:04:08 -05:00
2efd6e2078
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
b58d62c699
Merge pull request #28577 from chchliang/defercode
...
function setupOOMScoreAdj file close illogicality
Upstream-commit: 06e92cc2c1e840095f2f11f576fe6097b0fc44af
Component: engine
2016-11-18 11:48:58 -05:00
7534114314
judge manager before unlocking
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 972a246c671b52786a5e57743babfcf7b5b5ae99
Component: engine
2016-11-18 23:49:40 +08:00
42dbfa07b6
function setupOOMScoreAdj file close illogicality
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: e82fa89bcd7118af9b1a7ef2f15748a9e879813d
Component: engine
2016-11-18 17:34:01 +08:00
8e7b567a6b
Fix cfs period calculation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: aff99136b44c0a3d9ef381afd38a5cd05328ddc6
Component: engine
2016-11-18 00:47:43 -08:00
f88393dfba
Merge pull request #28458 from yongtang/28456-cpus-error-message
...
Fix error messages for `--cpus` from daemon
Upstream-commit: 4b29f404b1afe0989426d7a0cc0d2e01a7a3f2b6
Component: engine
2016-11-17 16:29:21 -08:00
d9512c0fad
do not force target type for secret references
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
use secret store interface instead of embedded secret data into container
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: bebd472e40cae91b548e983872a2665a5836ba43
Component: engine
2016-11-17 15:49:02 -05:00
3de41949d9
Merge pull request #28551 from cpuguy83/28517_dont_spew_so_much
...
Reduce spew data dumped
Upstream-commit: f297dea6575845b87957ebbeebe149cccf3a5e08
Component: engine
2016-11-17 21:37:06 +01:00
a43886ca90
Merge pull request #28538 from yongtang/11162016-Log-Logf-fix
...
Fix several issues with `go vet` and `gofmt -s`
Upstream-commit: 22dccaf2d6503e141e48ae3d9f3edc7ace946bbd
Component: engine
2016-11-17 15:21:22 -05:00
ffe69df229
Merge pull request #28462 from tonistiigi/health-deadlock
...
Fix deadlock on cancelling healthcheck
Upstream-commit: c2fbf0871df2e2e41adc6a08e6bfd47e09e69ff9
Component: engine
2016-11-17 10:30:57 -08:00
1f1e59bbc9
Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists
...
remove unused error ErrPendingSwarmExists
Upstream-commit: 8a6c5358af9cf4485cd2c993a9d4111deb10c81c
Component: engine
2016-11-17 10:17:47 -08:00
d6c74c3fa0
Reduce spew data dumped
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4130eb24e9e844bcfa9a336a7fef7698ad0e5c9f
Component: engine
2016-11-17 13:10:48 -05:00
dcce853abc
Fix several issues with go vet and go fmt
...
For some reason, `go vet` and `go fmt` validate does not capture
several issues.
The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```
The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```
Fixed above issues with `go vet` and `go fmt -s`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ace786e9d517777473bd431e65d6c464d82e4f65
Component: engine
2016-11-17 06:31:28 -08:00
a72341ea0d
Merge pull request #28498 from rhvgoyal/rwlayer-opts
...
Move CreateRWLayer() parameters in a struct
Upstream-commit: 85bc735b4a56223c84971839d819ff8dc494c181
Component: engine
2016-11-17 13:57:59 +01:00
700764fb6d
Fix the typo
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 9551dd03cfad2ec0a00d89c2177fb7b45b6ad885
Component: engine
2016-11-17 14:13:38 +08:00
061156aacb
remove unused error ErrPendingSwarmExists
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7777557a3a8599fbbd8e9a04d7328898c663ded1
Component: engine
2016-11-17 14:06:08 +08:00
3e22d4d10e
Windows: Revert 27884
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7e03ce3f13baa61ce5547574163059b712b37025
Component: engine
2016-11-16 13:38:45 -08:00
98fb763827
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 >
Upstream-commit: f7f3d34210fd8d25a929c6b9048e74e7ee40a558
Component: engine
2016-11-16 16:31:23 -05:00
7acf8456de
Merge pull request #27631 from allencloud/get-node-brefore-update
...
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
2016-11-16 17:47:31 +01:00
107032adcb
Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement
...
Remove redundant 'if' statement
Upstream-commit: 4dff5381180d25c9037175c3344902008e15e00c
Component: engine
2016-11-16 11:34:40 -05:00
ba567e9b07
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 >
Upstream-commit: d63dc45f0b34be6e25592ea6322a462497a89507
Component: engine
2016-11-16 16:50:54 +08:00
166b57151d
function TestCreateSuccess uses a wrong variable LogGroupName
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 320c93824b7c4dca3086258264ab142fe4530165
Component: engine
2016-11-16 16:48:36 +08:00
7c64e36522
Fix deadlock on cancelling healthcheck
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 89b123473774248fc3a0356dd3ce5b116cc69b29
Component: engine
2016-11-15 20:10:16 -08:00
d6be8a084e
Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
...
Using distribution reference pkg (pin image by digest)
Upstream-commit: 6697fa8a68db41162063df90f54f8b039d4ca4a1
Component: engine
2016-11-15 20:05:26 -08:00
0d115ba911
allow node update api receive node name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
2016-11-16 10:18:19 +08:00
24edf94c3b
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 >
Upstream-commit: d22ac2f3a0de8e2ff6da8f1787e3ac3ac7438f17
Component: engine
2016-11-15 17:16:09 -08:00
f5355b9dd8
Refactoring code for pinning image by digest
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: dc1b6341b98c3d009342a878119f683bfe14b471
Component: engine
2016-11-15 13:54:47 -08:00
ca2d19d2b7
Use Container.Config.Shell instead of hardcoded…
...
… for healthcheck. It make the code a little cleaner and more
future/usage proof.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5f81cf11f648835bd0182d297d265a4da6c469dd
Component: engine
2016-11-15 17:53:24 +01:00
68648e07db
move func getNetwork into helper.go to keep consistent
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 729b49e9c546c035788e60ea137b0958d10aadde
Component: engine
2016-11-16 00:28:56 +08:00
ad9327f119
Move StreamConfig out of runconfig
...
`StreamConfig` carries with it a dep on libcontainerd, which is used by
other projects, but libcontainerd doesn't compile on all platforms, so
move it to `github.com/docker/docker/container/stream`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5ea75bb6bf41aeaeaa15d8bcceea5be87c211ffc
Component: engine
2016-11-14 15:15:09 -05:00
7a9630020f
fix t.Errorf to t.Error in serveral _test.go
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn >
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
2016-11-14 17:54:43 +08:00
a107ce5f56
Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
...
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
e7777cd3a6
Merge pull request #28310 from mlaventure/docker-info-update
...
Docker info binaries version update
Upstream-commit: 1e673b9876ab4a12e7718424db9484fca6f516b3
Component: engine
2016-11-13 21:24:51 +01:00
