1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

31042 commits

Author SHA1 Message Date
Nalin Dahyabhai
d57c330617 Synchronize the cursor returned by followJournal
Make sure that the cursor value returned by followJournal() is the last
of the values returned by its goroutine's calls to drainJournal() by
waiting for it, rather than returning a value that may be superceded by
another if we're singalling the goroutine that it should exit by closing
a pipe.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-02-22 16:22:00 -05:00
Vincent Demeester
4534dcd494 Merge pull request from WeiZhang555/stats-all-docs
[Docs] Add docs for stating stopped containers
2017-02-22 11:14:15 +01:00
Vincent Demeester
89fe0e1b14 Merge pull request from yongtang/29448-swagger-version
Improve documentation of `Version` usage for Swarm API
2017-02-22 10:59:10 +01:00
Akihiro Suda
f001c54fee Merge pull request from lixiaobing10051267/masterCliTest
rectify the function name used by note
2017-02-22 17:40:50 +09:00
lixiaobing10051267
8fff3ea3d6 rectify the function name used by note
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-02-22 16:13:45 +08:00
Lei Jitang
ffc70d2f0c Merge pull request from lixiaobing10051267/masterAttach
invalide detach keys provided
2017-02-22 11:28:15 +08:00
lixiaobing10051267
660ec32e8f invalide detach keys provided
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-02-22 09:48:18 +08:00
Alexander Morozov
093867b9a6 Merge pull request from runcom/fix-build-cache-from
image/cache: fix isValidParent logic
2017-02-21 15:57:18 -08:00
Yong Tang
61e3e80b63 Improve documentation of Version usage for Swarm API
This fix is an attempt to improve the documentation of
`Version` usage for Swarm API in Swagger docs.

As is shown in the docs updates, `Version` field in Swarm
API is a way to ensure safe concurrency and determinism
so that multiple updates to the same swarm related objects
(Node, Service, etc) will not unintentially overwrite each other.

This fix fixes 29448.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-21 15:42:25 -08:00
Victor Vieux
19795b934c Merge pull request from xuzhenglun/master
fix wrong print format
2017-02-21 14:13:32 -08:00
Sebastiaan van Stijn
1138803d66 Merge pull request from thaJeztah/move-james-to-alumni
move James to alumni
2017-02-21 23:11:08 +01:00
John Howard
5fd1aee29a Merge pull request from friism/update-windows-dockerfiles
update git, hoist powershell setttings to top and get git simpler
2017-02-21 10:53:57 -08:00
Antonio Murdaca
1cf4b2b8bd
image/cache: fix isValidParent logic
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-02-21 19:32:04 +01:00
Sebastiaan van Stijn
d1b8126331
move James to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-21 18:20:49 +01:00
Alexander Morozov
1ad165dba1 Merge pull request from tonistiigi/more-locks
Add more locking to storage drivers
2017-02-21 07:39:33 -08:00
Vincent Demeester
aef8aa565f Merge pull request from duglin/BuildArgDocs
Add even more docs around BuildArgs and *string
2017-02-21 09:46:31 +01:00
Doug Davis
9419ccd706 Add even more docs around BuildArgs and *string
PR  made me think I needed to add more text explaing why
BuildArgs needs to be a *string instead of string.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-02-20 19:19:56 -08:00
Reficul
9b1ceecd8a
fix wrong print format
Signed-off-by: Reficul <xuzhenglun@gmail.com>
2017-02-21 10:26:06 +08:00
Sebastiaan van Stijn
25500d56a5 Merge pull request from YuPengZTE/devSwarmCliExplain
fix the type
2017-02-21 00:59:58 +01:00
Victor Vieux
f10085165a Merge pull request from vieux/missing_api_changes
add missing API changes
2017-02-20 15:42:19 -08:00
Vincent Demeester
75843d36aa Merge pull request from erxian/refine-service-update-document
add rollback explanation to docker service update command document
2017-02-20 09:29:38 +01:00
erxian
34919accaa add rollback explanation to docker service update command document
Signed-off-by: erxian <evelynhsu21@gmail.com>
2017-02-20 11:37:07 +08:00
Vincent Demeester
91cffdbedb Merge pull request from tonistiigi/fix-size-lock
Don’t hold container lock for size calculation
2017-02-19 16:31:21 +01:00
Victor Vieux
a7e6d2ca1f add missing API changes
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-19 01:33:43 -08:00
Sebastiaan van Stijn
475a8be5e5 Merge pull request from pastcompute/patch-1
Fix missing whitespace between words in manpage
2017-02-19 01:24:38 -08:00
Andrew McDonnell
296c803d32 Fix whitespace error.
Signed-off-by: Andrew McDonnell <bugs@andrewmcdonnell.net>
2017-02-19 17:28:26 +10:30
Tonis Tiigi
bd33a99acf Don’t hold container lock for size calculation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-18 18:11:48 -08:00
Sebastiaan van Stijn
b89aff1afa Merge pull request from allencloud/add-link-query-in-container-rm-api-doc
add link query in container rm api doc
2017-02-18 09:53:51 -08:00
Victor Vieux
04c6a04f29 Merge pull request from yongtang/29972-service-read-only-follow-up
Update version-history.md for `ReadOnly` parameter
2017-02-17 23:24:24 -08:00
Sebastiaan van Stijn
6486924f0b Merge pull request from thaJeztah/swarm-node-error-return-503
fix status-code for "locked" swarm and "certificate expired"
2017-02-17 21:10:45 -08:00
Yong Tang
097b38c15d Update version-history.md for ReadOnly parameter
This fix updates the `docs/api/version-history.md`
for `ReadOnly` parameter, which is now available in
`POST /services/create` and `POST /services/(id or name)/update`.

This fix is a follow up to 30162.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-17 19:18:37 -08:00
Sebastiaan van Stijn
cf449cf69c Merge pull request from alihandemir/patch-1
Update LICENSE date
2017-02-17 17:44:36 -08:00
Victor Vieux
7761c69e23 Merge pull request from Microsoft/jjh/fix30278
Windows: Retry workaround for RS1/RS2 compute system enumeration
2017-02-17 16:53:16 -08:00
Sebastiaan van Stijn
7e44fffe40
fix status-code for "locked" swarm and "certificate expired"
These errors were producing the wrong status code,
changing to 503.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-17 16:51:50 -08:00
Tonis Tiigi
fc1cf1911b Add more locking to storage drivers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-17 15:50:25 -08:00
Victor Vieux
cf5fe9ed0b Merge pull request from vieux/switch_to_new_versioning_scheme
Switch to new versioning scheme
2017-02-17 15:43:28 -08:00
Brian Goff
95a2aed95e Merge pull request from thaJeztah/fix-TestPullFailsWithAlteredLayer
fix TestPullFailsWithAlteredLayer
2017-02-17 16:24:34 -05:00
Anusha Ragunathan
6dd2a82458 Merge pull request from jmzwcn/issueNNP
[feature]: add daemon flag to set no_new_priv as default for unprivileged containers
2017-02-17 11:43:43 -08:00
Sebastiaan van Stijn
4077614fb3
fix DockerSchema1RegistrySuite.TestPullFailsWithAlteredLayer
This test was failing if after the busybox image switched to a
single layer.

The test fails because it alters the data of an empty layer and
relies on a side effect of another empty layer not being skipped
on pull to pass.

(The original patch was provided by Tonis Tiigi)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-17 10:34:33 -08:00
Anusha Ragunathan
b1debf1374 Merge pull request from yongtang/11062016-service-ps-format
Add `--format` to `docker service ps`
2017-02-17 10:23:18 -08:00
Alexander Morozov
0de867b315 Merge pull request from adshmh/24631-service-without-labels-returns-empty-map
Inspect output on service without labels is an empty map instead of null, fixes 
2017-02-17 08:49:32 -08:00
Alexander Morozov
f00514a1d0 Merge pull request from allencloud/split-compose-stack-deploy-from-deploydotgo
split compose deploy from deploy.go
2017-02-17 08:48:51 -08:00
Vincent Demeester
40532143c2 Merge pull request from nishanttotla/suppress-digest-docker-ps
Suppressing image digest in docker ps
2017-02-17 10:27:49 +01:00
Vincent Demeester
0ac25dfc75 Merge pull request from miaoyq/rewrite-validate-privileges
Rewrite the function 'validatePrivileges' without checking order
2017-02-17 10:24:11 +01:00
Vincent Demeester
146bc072a9 Merge pull request from tonistiigi/fix-overlay2-unmount
overlay2: fix unmounting layer without merge dir
2017-02-17 10:21:47 +01:00
allencloud
f46a14f7b6 split compose deploy from deploy.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-17 17:13:31 +08:00
Vincent Demeester
d07cd8c321 Merge pull request from cpuguy83/cleanup_volumedriver_retry_test
Use vol plugin creator instead of inserting spec
2017-02-17 09:46:31 +01:00
Vincent Demeester
e1839ab953 Merge pull request from tonistiigi/update-docs-link
Update storage driver options link
2017-02-17 09:45:31 +01:00
Brian Goff
a2106c8224 Merge pull request from fate-grand-order/branch
Correct fmt.Fprintf and t.Fatalf
2017-02-16 23:02:03 -05:00
Brian Goff
8e57694452 Merge pull request from xulike666/make-code-readable-again
Typo fixed and this time I provide my cSpell.json
2017-02-16 22:04:27 -05:00