86ea274c7e
Mask join tokens in daemon logs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e3917c76ce6f75e6c12cd2099d403fdaba8ab218
Component: engine
2016-08-02 15:15:23 -07:00
4427fb747e
Merge pull request #25345 from dperny/fix-service-inspect-pretty
...
Fix missing newline in service inspect --pretty
Upstream-commit: 404705fd8e5465dd3e314d04c11cb299c195dd52
Component: engine
2016-08-02 17:50:28 -04:00
15ac980cd0
Merge pull request #25159 from diogomonica/adding-force-to-node-remove
...
Adding force to node rm
Upstream-commit: 10ae908bfa88bf128ce416067391ed125ad0f1be
Component: engine
2016-08-02 22:49:15 +02:00
37e0314e79
Fix missing newline in service inspect --pretty
...
Printing off networks as part of --pretty was missing a newline, causing
the next thing printed to be concatenated onto the end of the line.
Added an empty println after all networks are printed.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 02ebaf364ff0463c65d63fd1c3c11840a578fc45
Component: engine
2016-08-02 13:27:35 -07:00
8ea3665947
Merge pull request #25282 from clhlc/clhlc-patch-1
...
Update swarm-mode.md
Upstream-commit: 181f5ac6276fd47a81ea0931c4fd170ceb3508ed
Component: engine
2016-08-02 13:06:24 -07:00
b4ea667700
Merge pull request #25241 from jhorwit2/jah/ps-doc-fix
...
Added shutdown to desired-state docs for filter node/service ps
Upstream-commit: 1d8617a42b9e85f3098174234401d02595f84a79
Component: engine
2016-08-02 13:05:47 -07:00
4dee939a7c
Merge pull request #25333 from cpuguy83/25331_fix_missing_mount_id
...
Fix missing mount ID on volume unmount
Upstream-commit: f0d7bd597bbe3ca2b0c8a232928c703152087294
Component: engine
2016-08-02 13:10:54 -04:00
d76a57b54d
Merge pull request #25308 from thaJeztah/join-token-refactor
...
Improve swarm join-token instructions
Upstream-commit: 3d28cdd2f5e91e042848321de4cc4dff6735d84d
Component: engine
2016-08-02 18:57:37 +02:00
4d3e916059
Merge pull request #25300 from duglin/FixEnv
...
Don't allow empty env names
Upstream-commit: c73b054ae384a519330de765026d7aed41a3e027
Component: engine
2016-08-02 09:45:28 -07:00
13ecc55b8a
Merge pull request #25330 from yongtang/docs-service-create-update-user
...
Update docs in `docker service create/update` for flag `--user`
Upstream-commit: 50c08f0f0990740a574d22cfd95e0ae5b8b13958
Component: engine
2016-08-02 17:58:39 +02:00
a1b703934e
Fix missing mount ID on volume unmount
...
Fixes #25331
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 63983f3ffe7895fce3a75115a5bcfe8258e5654c
Component: engine
2016-08-02 11:24:54 -04:00
6d26e235fc
Merge pull request #25105 from hqhq/fix_kmem_test
...
Fix TestUpdateKernelMemoryUninitialized on new kernel version
Upstream-commit: b47df1ddbe847bdffccb76239e3288d59b69cb3b
Component: engine
2016-08-02 17:15:53 +02:00
f03613aded
Improve swarm join-token instructions
...
this change improves the instructions for
swarm join-token and swarm init;
- only print the join-token command for workers
instead of for both managers and workers, to
prevent users from copying the wrong command.
An extra line is added to explain how to obtain
the manager token.
- print a message that a token was rotated
sucesfully if '--rotate' is used.
- add some extra white-space before / after
the join commands, to make copy/pasting
easier.
this change also does some refactoring of join-token;
- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
to prevent checking for them multiple times, and to
keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
this makes it easier to copy, and cleans up the
code a tiny bit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ebebd4176940bc907ba4e8f5fbe62f6a050f8ed4
Component: engine
2016-08-02 16:44:02 +02:00
96d8037700
Update docs in docker service create/update for flag --user
...
In `docker service create/update`, flag `--user` actually supports
`uid:gid` (same as `docker run`). However, this is not reflected
in the help and documentation yet.
This fix updates docs in `docker service create/update` to change
the description to `Username or UID (format: <name|uid>[:<group|gid>])`.
The help message output has also been updated.
This fix is related to 25304.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 80a3755a8f9eac577b65c3403bcbb23a120e6585
Component: engine
2016-08-02 07:01:16 -07:00
7b2c91fa58
Merge pull request #25316 from cpuguy83/25310_persit_volume_opts
...
Fix issue reloading mount options on restart
Upstream-commit: 2011320fa9e09d1cc19e3f0840d534e7200b0401
Component: engine
2016-08-02 15:45:05 +02:00
6ae69a861f
Merge pull request #25318 from lixiaobing10051267/masterParentheses
...
A parenthesis omitted in Seccomp.md
Upstream-commit: d7c9c85e3093cef9e014be12951d226ab45bbba6
Component: engine
2016-08-02 12:27:19 +02:00
07090fecc2
Merge pull request #25314 from swernli/revert-25066-masterErr
...
Revert "Add checking err for IsWindowsClient()"
Upstream-commit: 7d4ab5ca85d3f694d7ce4c8d54db5876a94df4f5
Component: engine
2016-08-02 07:49:41 +02:00
919b659026
Fix kernel memory updating docs
...
Specify that kernel memory updating limitation only applies
on kernel version older than 4.6.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 59069ba29a9a16c7679bed4cbf2e9d477363aa79
Component: engine
2016-08-02 13:36:58 +08:00
5ef37313b9
Fix TestUpdateKernelMemoryUninitialized on new kernel version
...
Fixes : #25073
Update kernel memory on running containers without initialized
is forbidden only on kernel version older than 4.6.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: da5d66fb70064b093f73cc31eddb7e8285048161
Component: engine
2016-08-02 13:17:20 +08:00
d7f691cfe1
A parenthesis omitted in Seccomp.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 227cae6680d9c2ff8b1583ab4efdec54bdc36688
Component: engine
2016-08-02 12:24:15 +08:00
d3a8f088ac
Update swarm-mode.md
...
Signed-off-by: lichao <lichao@papayamobile.com >
Upstream-commit: 4f1a57a8e14a3ce7d572434020e231e072eb9e13
Component: engine
2016-08-02 11:36:32 +08:00
d491895d0a
Fix issue reloading mount options on restart
...
On daemon restart the local volume driver will read options that it
persisted to disk, however it was reading an incorrect path, causing
volume options to be silently ignored after a daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c560dd968600ebc9c1ff78f256ee93a6ded9a728
Component: engine
2016-08-01 23:30:39 -04:00
0e5400a423
Add --force to node removal
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com >
Upstream-commit: a327c231b5c68c13b7dcde2fdc83b8e4cec59c43
Component: engine
2016-08-01 18:55:58 -07:00
c99b7360ea
Merge pull request #25204 from yongtang/25195-docker-info-ca-configuration
...
Output external CAs in swarm mode with `docker info`
Upstream-commit: 8f78dae4e308e47eb6cdba643c995a8a9b46b0cd
Component: engine
2016-08-01 21:34:00 -04:00
9027f05cc9
Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
...
Fix swarm manager node fault tolerance table
Upstream-commit: ceb4126aa0cfcaf7842d22351876dc35dff915b3
Component: engine
2016-08-01 18:31:46 -07:00
5bb33260e8
Revert "Add checking err for IsWindowsClient()"
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: d0b9c33f71f1e87e2236f1f9894ce28827791a7a
Component: engine
2016-08-01 17:33:41 -07:00
48cfcaddd4
Merge pull request #24878 from dongluochen/swarmConstraintTest
...
Add integration test for constraints
Upstream-commit: f35c4343f32aff4fb4f261e1dedb4200410d53b4
Component: engine
2016-08-01 17:45:23 -06:00
a35a169675
Merge pull request #25171 from cpuguy83/23545_test_sockets_in_separate_dir
...
Use temp dir for integration daemon sockets
Upstream-commit: f23c3a1263b4549030488938741ec6656f2f0133
Component: engine
2016-08-02 01:21:22 +02:00
f1f1cf0467
Merge pull request #25294 from klinden/patch-1
...
adding entry for Hugh Beaver
Upstream-commit: f2fb28cbb3f32b6ffec209dd4452b126f769f2ef
Component: engine
2016-08-02 01:01:13 +02:00
4d20df22ad
Merge pull request #24947 from dnephin/integration-remove-cmdwithargs
...
Remove CmdWithArgs from integration-cli
Upstream-commit: 415c0f12d2e2edf35daa626e8fe577e7248e4572
Component: engine
2016-08-01 14:56:08 -07:00
4b66696a05
Merge pull request #25129 from mlaventure/fix-weird-rpc-lock-on-master
...
Attach stdin after attach stdout/err to avoid an rpc lock
Upstream-commit: 67a47d78a18d799719df61b93a54a246eb97b209
Component: engine
2016-08-01 14:52:09 -07:00
08f50a9752
Merge pull request #25187 from anusha-ragunathan/plugin-delete
...
Remove plugin root from filesystem.
Upstream-commit: 3c46c3481fb6378562183c9f281e29f84b2b527e
Component: engine
2016-08-01 14:33:30 -07:00
a208ce0e44
Merge pull request #25306 from yongtang/08012016-docker-service-create-workdir
...
Replace `"workdir'` with const `flWorkdir`, same as other flags in `service create`
Upstream-commit: 1d5bb597b8d275b3f6738e6d819afd4cc7d2c225
Component: engine
2016-08-01 13:57:56 -07:00
d1166d12d4
Add entries for Hugh Beaver, Lois Haibt and some more adjectives
...
Signed-off-by: Kyle Linden <kyle.linden@appliedis.com >
Upstream-commit: 653d083c1e887617f87d89a128d1398b90e0dd50
Component: engine
2016-08-01 16:05:27 -04:00
25dfa2b9fa
Merge pull request #24821 from thaJeztah/stringid-refactor
...
Minor refactor and beter coverage for pkg/stringid
Upstream-commit: d2eb5dc9e0365ea4d50076011a7ef92d435b5032
Component: engine
2016-08-01 21:12:14 +02:00
0883d55bb8
Replace "workdir' with const, same as other flags in service create
...
This is a minor fix that tries to replace `"workdir"` with const in `service create`.
Since `"workdir"` is the only string not defined as const in `func addServiceFlags()`,
I think it makes sense to replace `"workdir"` with a const to be consistent.
The flag `"workdir"` in `service update` has also been replaced.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 55d05fc0556dc7d3ff3c65b8d739e48a1f79afab
Component: engine
2016-08-01 11:45:28 -07:00
fba16f2b3f
Merge pull request #25205 from lixiaobing10051267/masterPath
...
Give the correct link of docker swarm init
Upstream-commit: 93fea86d1da9088899481519412070e2207cfd40
Component: engine
2016-08-01 11:34:54 -07:00
b8ad5adb41
Merge pull request #25288 from allencloud/make-pkg-pidfile-support-darwin
...
make pkg pidfile support darwin
Upstream-commit: e60c31d4f9b3c43e8f32593ed1d2c75db6509c3e
Component: engine
2016-08-01 10:47:40 -07:00
99b9e36eb0
Remove plugin root from filesystem.
...
`docker plugin remove` didnt actually remove plugin from disk. Fix that.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5690730a7471726bbaf813e634a7117a562dfb8c
Component: engine
2016-08-01 10:46:50 -07:00
97a0178f2f
Merge pull request #25229 from bboreham/multi-unix-sockets
...
Fix Upstart post-start script when using multiple Unix sockets
Upstream-commit: 016c0076ee0dbaac58674466573f037ea894ed77
Component: engine
2016-08-01 19:43:07 +02:00
bb00cee2aa
Don't allow empty env names
...
Closes : #25281
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e72c0137af63c2f5aecce48443e3b654a3895150
Component: engine
2016-08-01 10:25:51 -07:00
0e7aaf609b
Merge pull request #25283 from unclejack/bump_go_patricia_2.2.4
...
vendor.sh: bump go-patricia to 2.2.4 to fix leaks
Upstream-commit: ccbdc16b8ea2a43498eda038a84bc03b0d26f630
Component: engine
2016-08-01 09:32:21 -07:00
c972743442
Merge pull request #25296 from thaJeztah/move-david-to-alumni
...
Move David to alumni
Upstream-commit: befb4568325054793d909c775f581e0f26841364
Component: engine
2016-08-01 08:34:08 -07:00
26e5b81522
Move David to alumni
...
Unfortunately, combining a job as CTO and maintaining
Docker is too much to combine, so David asked to be
moved to the alumni section.
Thanks for all the awesome work on Docker!
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a54858e2fe3dba7d1cfea13027a934aafc9081a4
Component: engine
2016-08-01 17:11:17 +02:00
70aa42709e
Merge pull request #25271 from yongtang/25141-better-error-IP-address-autodetection
...
Better error messages when IP address autodetection fails
Upstream-commit: 361de697bbf62e8b1134cd54dc90bf0204473e5e
Component: engine
2016-08-01 11:00:21 -04:00
c8468e1fc2
make pkg pidfile support darwin
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a91f59d4873e9866928261ad62ebcea3ef7add5f
Component: engine
2016-08-01 22:01:20 +08:00
9e26955cc7
Added shutdown to desired-state docs for filter node/service ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
$Updated http docs for /tasks filters
$Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: aae149bd525fb6f3e9a90e45f0d7ba28d568f17a
Component: engine
2016-08-01 09:41:54 -04:00
8c0fcc0e8f
Merge pull request #25258 from yongtang/24547-remove-require-network-from-swarm-tests
...
Remove testRequires(c, Network) from swarm integration tests
Upstream-commit: 2b90eaa596ee9429222973d3208da1c1f172c4e0
Component: engine
2016-08-01 13:33:36 +02:00
b68ed83409
Merge pull request #25268 from allencloud/better-container-kill-log
...
make container kill debug log readable
Upstream-commit: 3a538aca97dd206b22dc20c9f8f0981e63ac3771
Component: engine
2016-08-01 11:36:40 +02:00
3da2c0af7c
vendor.sh: bump go-patricia to 2.2.4 to fix leaks
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3d714b5ed58cfdfd5872ddd3654d171b09bb02d3
Component: engine
2016-08-01 12:21:19 +03:00
Tonis Tiigi
Brian Goff
Sebastiaan van Stijn
Drew Erny
Sven Dowideit
Vincent Demeester
Alexander Morozov
Sebastiaan van Stijn
Yong Tang
Qiang Huang
lixiaobing10051267
Lee Chao
Diogo Monica
Stefan J. Wernli
Aaron Lehmann
Tibor Vass
Kyle Linden
Charles Smith
Anusha Ragunathan
Doug Davis
Michael Crosby
allencloud
Josh Horwitz
unclejack