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

26457 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
ed1a313d8f Merge pull request #25556 from vieux/plugin_description 
add description in docker plugin ls
 2016-08-11 14:08:50 +02:00
Vincent Demeester
a3432c2fdb Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api 
add fields in volume api for 1.24, 1.25
 2016-08-11 14:03:25 +02:00
allencloud
b015fd4fb3 add fields in volume api for 1.24, 1.25 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-11 19:56:17 +08:00
Sebastiaan van Stijn
f1101ebf3e Merge pull request #25611 from lixiaobing10051267/masterJoin 
docker swarm join command has no flag '--swarm-token'
 2016-08-11 13:30:07 +02:00
lixiaobing10051267
fcf732117d docker swarm join command has no flag 'X--swarm-token' 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-11 19:49:38 +08:00
Sebastiaan van Stijn
81fca603a4 Merge pull request #25610 from lixiaobing10051267/masterSwarm 
optimize some descriptions for swarm nodes.md
 2016-08-11 13:29:47 +02:00
lixiaobing10051267
fa52bd5cf8 optimize some descriptions for swarm nodes.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-11 19:07:56 +08:00
Sebastiaan van Stijn
a19029a719 Merge pull request #25573 from thaJeztah/improve-runmetrics-layout 
docs: improve layout for runmetrics
 2016-08-11 10:43:15 +02:00
Vincent Demeester
e42cc1f6c5 Merge pull request #25585 from yongtang/22311-log-opts-map 
Update docs so that log-opts takes map (`{}`) instead of `[]`
 2016-08-11 09:55:25 +02:00
Vincent Demeester
e26c35408d Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs 
Add node remove "force" parameter to 1.25 API docs
 2016-08-11 09:47:41 +02:00
Vincent Demeester
39b379cc63 Merge pull request #25592 from thaJeztah/carry-25344-fix-firewalld-startup-order 
[carry 25344] deal with firewalld/docker startup issues
 2016-08-11 09:46:44 +02:00
Ramon Brooker
73e08286f9
deal with firewalld/docker startup issues 
added the firewalld.service symbol in the After line docker
will always start after firewalld, thus eliminating the issue
of firewall blocking all mapped traffic.

Signed-off-by: Ramon Brooker <Ramon.Brooker@imaginecommunications.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-11 00:13:33 +02:00
Alexander Morozov
2a540c18b6 Merge pull request #25546 from tonistiigi/update-swarmkit 
vendor: update swarmkit to cb6d8131
 2016-08-10 15:03:08 -07:00
Sebastiaan van Stijn
960b7de456 Merge pull request #25588 from thaJeztah/fix-events-since-description 
Fix events "since" query parameter description
 2016-08-10 23:32:26 +02:00
Sebastiaan van Stijn
ceed39b530
Fix events "since" / "until" query parameter description 
The "since" query parameter can be *useful*
for polling (in combination with "until"), but
doesn't actualy stop the endpoint from streaming
events.

This patch updates the description to better
clarify that "since" does not make the endpoint
non-streaming.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 23:17:04 +02:00
Brian Goff
79b7062f0a Merge pull request #25583 from cpuguy83/fix_missing_daemon_sock_test 
Ignore socket rm errors on daemon suite teardown
 2016-08-10 17:04:45 -04:00
Sebastiaan van Stijn
06fa5c12e8
Add node remove "force" parameter to 1.25 API docs 
This parameter was documented for 1.24, but we
forgot to add it to the 1.25 docs as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 23:01:17 +02:00
Tonis Tiigi
5673c53417 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 13:27:38 -07:00
Tonis Tiigi
3b555a575d vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 13:27:38 -07:00
Victor Vieux
16d5fbfd9a add description in docker plugin ls 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-10 13:06:18 -07:00
Yong Tang
f9ef1c892d Update docs so that log-opts takes map ({}) instead of [] 
This fix updates docs so that log-opts takes map (`{}`) instead
of `[]`, as is defined in the impmenetation (`map[string]string`)

This fix fixes 22311.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-10 12:50:10 -07:00
Brian Goff
e34244842c Ignore socket rm errors on daemon suite teardown 
Errors here are not important and not really related to set success/failure.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-08-10 15:18:35 -04:00
Tibor Vass
19a3289250 Merge pull request #25567 from justincormack/name_to_handle_at 
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
 2016-08-10 12:02:23 -07:00
Tibor Vass
92b10b497c Merge pull request #25550 from mrjana/net 
Retry creating dynamic networks if not found
 2016-08-10 11:52:56 -07:00
Tibor Vass
fc40ed24d8 Merge pull request #25334 from crosbymichael/selinux-fedora 
Add selinux policy per distro/version
 2016-08-10 11:40:33 -07:00
Alexander Morozov
64605d709f Merge pull request #23951 from allencloud/defer-os-file-close 
add defer file.Close to avoid potential fd leak
 2016-08-10 11:07:15 -07:00
Tibor Vass
a6aea68c35 Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie 
Add support to install Docker on raspbian/jessie
 2016-08-10 11:06:04 -07:00
Sven Dowideit
ce2ca236db Merge pull request #25569 from friism/fix-typo-in-security-doc 
update intro to say there are four things to consider
 2016-08-10 10:34:43 -07:00
Tibor Vass
93b9b19204 Merge pull request #25553 from vieux/restart_plugin 
fix plugins restart on docker restart
 2016-08-10 10:34:17 -07:00
Sebastiaan van Stijn
29fb644c18
Improve layout for runmetrics 
Change bullet-lists to tables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 18:42:43 +02:00
Michael Friis
9c37bf9f1f update intro to say there are four things to consider 
Signed-off-by: Michael Friis <friism@gmail.com>
 2016-08-10 08:45:24 -07:00
Vincent Demeester
414e3f3cab Merge pull request #25563 from lixiaobing10051267/master100 
test container state timeout with 200 milliseconds
 2016-08-10 15:32:55 +02:00
Vincent Demeester
3b1f82b52d Merge pull request #25406 from pwzgorilla/master 
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
 2016-08-10 14:07:30 +02:00
Vincent Demeester
59ca493121 Merge pull request #25427 from yongtang/25404-service-update-env-add 
Fix `service update --env-add` issue
 2016-08-10 14:07:05 +02:00
Justin Cormack
c1ca124682 Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH 
Only open_by_handle_at requires CAP_DAC_READ_SEARCH.

This allows systemd to run with only `--cap-add SYS_ADMIN`
rather than having to also add `--cap-add DAC_READ_SEARCH`
as well which it does not really need.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-10 12:22:36 +01:00
lixiaobing10051267
51f927d4e5 test container state timeout with 200 milliseconds 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-10 17:19:25 +08:00
mgniu
dc4dcf89d8 use proto and addr replace protoAddrParts[0] and protoAddrParts[1] 
Signed-off-by: mgniu <mgniu@dataman-inc.com>
 2016-08-10 16:03:00 +08:00
Sebastiaan van Stijn
2f167a7609 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs 
Add delete and update API documentation
 2016-08-10 08:01:13 +02:00
allencloud
0ead624473 add defer file.Close to avoid potential fd leak 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-10 08:36:09 +08:00
Jana Radhakrishnan
117cef5e97 Retry creating dynamic networks if not found 
In cases there are failures in task start, swarmkit might be trying to
restart the task again in the same node which might keep failing. This
creates a race where when a failed task is getting removed it might
remove the associated network while another task for the same service
or a different service but connected to the same network is proceeding
with starting the container knowing that the network is still
present. Fix this by reacting to `ErrNoSuchNetwork` error during
container start by trying to recreate the managed networks. If they
have been removed it will be recreated. If they are already present
nothing bad will happen.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-08-09 13:37:11 -07:00
Alexander Morozov
eb28dde01f Merge pull request #25518 from yuexiao-wang/add-debug-info 
add more info for debugging
 2016-08-09 11:56:09 -07:00
Victor Vieux
ab12ed4a56 fix plugin restart on docker restart 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-09 11:49:28 -07:00
Sebastiaan van Stijn
91853e44ae Merge pull request #25415 from avaid96/exitret 
added functionality to interrupt the terminal when it is waiting for …
 2016-08-09 16:47:54 +02:00
Sebastiaan van Stijn
8233e2b54d Merge pull request #25461 from coolljt0725/fix_update_mem 
Fix update memory without memoryswap
 2016-08-09 16:02:55 +02:00
Sebastiaan van Stijn
04e021d751 Merge pull request #23391 from Microsoft/WindowsSandboxSize 
Windows: Added support for storage-opt size
 2016-08-09 15:34:39 +02:00
Sebastiaan van Stijn
06e3ea1417 Merge pull request #25530 from thaJeztah/docs-update-image-load-response 
docs: add missing "quiet" parameter for image/load and update response
 2016-08-09 15:26:16 +02:00
Sebastiaan van Stijn
80c49d1e52 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output 
Update example output for node inspect
 2016-08-09 15:24:43 +02:00
Vincent Demeester
da325c035d
Add delete and update API documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-09 14:50:46 +02:00
Sebastiaan van Stijn
dcb052c12b
Update example output for node inspect 
commit 41d580c7a6 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.

This change updates the example output
of node inspect in the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-09 13:04:35 +02:00
Sebastiaan van Stijn
41d580c7a6 Merge pull request #25512 from diogomonica/add-created-at 
Adding Joined at to node inspect --pretty
 2016-08-09 12:56:32 +02:00