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
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
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
ac2f27add0
judge manager before getting secret
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1addb4817bca8daeb3a3bca207705ad72f5c7a16
Component: engine
2016-11-13 12:52:09 +08:00
2967986572
don't spell error
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 167f2f3f1bb4cf80abe1fbb4a090179a850363e3
Component: engine
2016-11-12 14:57:37 +08:00
8ed32ee4ec
Merge pull request #28274 from Microsoft/jjh/acl
...
Windows: create daemon root with ACL
Upstream-commit: 2712bb26e33eea46b69776b7b8aa6e18da0d3554
Component: engine
2016-11-11 09:20:32 -08:00
a346d7cb58
Merge pull request #27872 from vdemeester/images-filter-filters
...
Add reference filter and deprecated filter param…
Upstream-commit: de325535d4fe83f522e5daa78bdd8d4f9795513f
Component: engine
2016-11-11 11:24:19 -05:00
9db7e23ff6
Remove extra binaries commit variables from windows build
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 17df5593ebcd471b0bbf0ea9d6e060ee3447850a
Component: engine
2016-11-11 08:24:17 -08:00
c69704a7d0
Fix version detection for docker-init
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 69f0402585579ced62bca22551a6ef45672bb4fd
Component: engine
2016-11-11 08:19:32 -08:00
e75f2fc3c8
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 820b809e70df8b9c7af00256182c48d935972a5c
Component: engine
2016-11-11 15:34:01 +01:00
e846f5ae11
Add support for stdin_open in composefile v3
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 84450b72cd73161449bae16b8ad0010fcc4a07eb
Component: engine
2016-11-11 15:19:00 +01:00
b7b4e2f3f9
Merge pull request #28128 from leth/commit_image_id
...
Add Image ID to container commit event
Upstream-commit: 90d10203a40d9f2e4247693d2154bdf0bdb6a07c
Component: engine
2016-11-10 23:14:46 -08:00
4d7a48f6ec
Merge pull request #27955 from mlaventure/runc-docker-info
...
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
2016-11-10 21:27:14 -08:00
e297f40024
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
2016-11-10 19:39:28 -08:00
840ea93170
Merge pull request #27917 from mrjana/ports
...
Add support for host port PublishMode in services
Upstream-commit: a5da9f5cc911da603a41bb77ca1ccbb0848d6260
Component: engine
2016-11-10 19:38:54 -08:00
128844d475
Merge pull request #28265 from aaronlehmann/dont-repull-digest
...
executor: Don't repull image if pinned by digest
Upstream-commit: 1229105582ff8a05493637e709e46edf2061c0c1
Component: engine
2016-11-10 19:19:31 -08:00
b688822593
Add support for host port PublishMode in services
...
Add api/cli support for adding host port PublishMode in services.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 14ac9f60d0174256e0713701ebffaf5ca827da71
Component: engine
2016-11-10 18:07:55 -08:00
ca36766d89
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -08:00
29d6547bdb
Windows: create daemon root with ACL
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 46ec4c1ae2700ed638072fd7fb326afc10eded20
Component: engine
2016-11-10 17:51:28 -08:00
874be028c3
Update for distribution vendor
...
Handle updates to reference package.
Updates for refactoring of challenge manager.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c85eb008416f352327b67dce351101591cd5f781
Component: engine
2016-11-10 17:34:12 -08:00
3baa399d95
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
d19c3e6850
Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
...
Fix failure to get containers when deleting a layer
Upstream-commit: d54f4472fdfad1a9c9b04ed2b50ac010556ab44e
Component: engine
2016-11-10 17:10:05 -08:00
3213314d62
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
2016-11-10 16:55:29 -08:00
ce9a44097a
Merge pull request #28268 from Microsoft/jjh/clientcheck
...
Windows: Additional client check
Upstream-commit: 29b7a737925d05f3fb46db97ae64661c6e9f3a31
Component: engine
2016-11-10 16:11:44 -08:00
fadae43674
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
2016-11-10 15:51:32 -08:00
87b507f694
Merge pull request #28228 from tonistiigi/swarm-cert-expired
...
Start daemon if certificates have been expired
Upstream-commit: 1e592349f192d020b14372f4d3c21cd3a7c8bd9a
Component: engine
2016-11-10 15:50:36 -08:00
4cf2d87976
Merge pull request #28221 from aboch/ala
...
Add local address autodetection on swarm init
Upstream-commit: 5d1feb561f1f8b402b5c77b2f27f3d571bd2b226
Component: engine
2016-11-10 15:45:59 -08:00
