0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29190 commits 14 branches 412 tags 338 MiB
Commit graph

4471 commits

Author SHA1 Message Date
Victor Vieux
3a6829257e Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
 2016-11-21 13:55:07 -08:00
Victor Vieux
6e4a3c4546 Merge pull request #28649 from allencloud/judge-locked-before-parsing-key 
judge manager if locked before parsing key
 2016-11-21 13:33:38 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
allencloud
89100c162b judge manager if locked before parsing key 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-21 16:39:09 +08:00
zhukj
cf3ef262b1 close the file 
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn>
 2016-11-21 19:56:01 +08:00
Vincent Demeester
baa14c0e61 Merge pull request #28026 from ripcurld00d/fix_27772 
Return an empty stats if the container is restarting
 2016-11-20 21:14:37 +01:00
Antonio Murdaca
514ca09426
api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-19 13:21:16 +01:00
Doug Davis
96f50e9b70 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
 2016-11-19 07:16:44 -05:00
Victor Vieux
f6f67891be Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded 
Use Container.Config.Shell instead of hardcoded…
 2016-11-18 18:54:36 -08:00
Victor Vieux
eb8fc5dcc3 Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins 
Allow graphdriver plugins to use v2
 2016-11-18 18:45:34 -08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Brian Goff
020b051dfb 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>
 2016-11-18 17:23:59 -05:00
Aaron Lehmann
30d0c3899e Merge pull request #28421 from aaronlehmann/digest-pinning-warnings 
Return warnings from service create/update when digest pinning fails
 2016-11-18 11:33:17 -08:00
Tõnis Tiigi
eb0fc787e6 Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking 
judge manager before unlocking
 2016-11-18 11:27:48 -08:00
Evan Hazlett
eb036ea4db
lint fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-18 13:04:08 -05:00
Aaron Lehmann
948e60691e 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>
 2016-11-18 09:31:31 -08:00
Brian Goff
06e92cc2c1 Merge pull request #28577 from chchliang/defercode 
function setupOOMScoreAdj file close illogicality
 2016-11-18 11:48:58 -05:00
allencloud
972a246c67 judge manager before unlocking 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 23:49:40 +08:00
chchliang
e82fa89bcd function setupOOMScoreAdj file close illogicality 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
 2016-11-18 17:34:01 +08:00
Michael Crosby
aff99136b4 Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-18 00:47:43 -08:00
Michael Crosby
4b29f404b1 Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
 2016-11-17 16:29:21 -08:00
Evan Hazlett
bebd472e40 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>
 2016-11-17 15:49:02 -05:00
Sebastiaan van Stijn
f297dea657 Merge pull request #28551 from cpuguy83/28517_dont_spew_so_much 
Reduce spew data dumped
 2016-11-17 21:37:06 +01:00
Brian Goff
22dccaf2d6 Merge pull request #28538 from yongtang/11162016-Log-Logf-fix 
Fix several issues with `go vet` and `gofmt -s`
 2016-11-17 15:21:22 -05:00
Alexander Morozov
c2fbf0871d Merge pull request #28462 from tonistiigi/health-deadlock 
Fix deadlock on cancelling healthcheck
 2016-11-17 10:30:57 -08:00
Alexander Morozov
8a6c5358af Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists 
remove unused error ErrPendingSwarmExists
 2016-11-17 10:17:47 -08:00
Brian Goff
4130eb24e9 Reduce spew data dumped 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-17 13:10:48 -05:00
Yong Tang
ace786e9d5 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>
 2016-11-17 06:31:28 -08:00
Sebastiaan van Stijn
85bc735b4a Merge pull request #28498 from rhvgoyal/rwlayer-opts 
Move CreateRWLayer() parameters in a struct
 2016-11-17 13:57:59 +01: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
John Howard
7e03ce3f13 Windows: Revert 27884 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-16 13:38:45 -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
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
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
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
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
Vincent Demeester
5f81cf11f6
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>
 2016-11-15 17:53:24 +01:00
allencloud
729b49e9c5 move func getNetwork into helper.go to keep consistent 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-16 00:28:56 +08:00
Brian Goff
5ea75bb6bf 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>
 2016-11-14 15:15:09 -05:00
wefine
f78f7de96a fix t.Errorf to t.Error in serveral _test.go 
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
 2016-11-14 17:54:43 +08:00
Vincent Demeester
0f20d6f5ab Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API 
judge manager before getting secret
 2016-11-13 22:19:07 +01:00
Vincent Demeester
1e673b9876 Merge pull request #28310 from mlaventure/docker-info-update 
Docker info binaries version update
 2016-11-13 21:24:51 +01:00
allencloud
1addb4817b judge manager before getting secret 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-13 12:52:09 +08:00
chchliang
167f2f3f1b don't spell error 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
 2016-11-12 14:57:37 +08:00