toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,454 Commits 3 Branches 295 Tags
7c0ad19006cfbcca76829b16dbf0534d4a0991a6
Commit Graph
26454 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Bentley 7c0ad19006 Add install of virtual kernel extras for AUFS 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: e715ca506f41b22cde21187328fcb416cec5e6a2
Component: engine
 2016-08-11 07:54:20 -04:00
Sebastiaan van Stijn 78c72ac827 Merge pull request #25611 from lixiaobing10051267/masterJoin 
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
 2016-08-11 13:30:07 +02:00
lixiaobing10051267 ea7fd73f3c docker swarm join command has no flag 'X--swarm-token' 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
 2016-08-11 19:49:38 +08:00
Sebastiaan van Stijn ed03b3e574 Merge pull request #25610 from lixiaobing10051267/masterSwarm 
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
 2016-08-11 13:29:47 +02:00
lixiaobing10051267 a0f2fd5022 optimize some descriptions for swarm nodes.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
 2016-08-11 19:07:56 +08:00
Sebastiaan van Stijn ca39dfa474 Merge pull request #25573 from thaJeztah/improve-runmetrics-layout 
docs: improve layout for runmetrics
Upstream-commit: a19029a719f209f1bf2e760f11225027787550e2
Component: engine
 2016-08-11 10:43:15 +02:00
Vincent Demeester 4074463266 Merge pull request #25585 from yongtang/22311-log-opts-map 
Update docs so that log-opts takes map (`{}`) instead of `[]`
Upstream-commit: e42cc1f6c53a139e08c28dee607105eecafc029e
Component: engine
 2016-08-11 09:55:25 +02:00
Vincent Demeester 1383b4fbda Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs 
Add node remove "force" parameter to 1.25 API docs
Upstream-commit: e26c35408d178e8f6b7c57e26dc57c6fa611622c
Component: engine
 2016-08-11 09:47:41 +02:00
Vincent Demeester f2b962fc15 Merge pull request #25592 from thaJeztah/carry-25344-fix-firewalld-startup-order 
[carry 25344] deal with firewalld/docker startup issues
Upstream-commit: 39b379cc632e9e2d7a6ace6e9aa7b40099945679
Component: engine
 2016-08-11 09:46:44 +02:00
Ramon Brooker 5b967c9349 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>
Upstream-commit: 73e08286f920881a431fa7befd3909e72303680b
Component: engine
 2016-08-11 00:13:33 +02:00
Alexander Morozov 64cc925c02 Merge pull request #25546 from tonistiigi/update-swarmkit 
vendor: update swarmkit to cb6d8131
Upstream-commit: 2a540c18b69bebd7153ba87ffc91aade95ba2769
Component: engine
 2016-08-10 15:03:08 -07:00
Sebastiaan van Stijn 361e7bc477 Merge pull request #25588 from thaJeztah/fix-events-since-description 
Fix events "since" query parameter description
Upstream-commit: 960b7de456883864479428cdabb5189a348eb700
Component: engine
 2016-08-10 23:32:26 +02:00
Sebastiaan van Stijn 4fe64ab5f6 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>
Upstream-commit: ceed39b530838451b5b9c64b372307a0cc8492ab
Component: engine
 2016-08-10 23:17:04 +02:00
Brian Goff 0b22ed7997 Merge pull request #25583 from cpuguy83/fix_missing_daemon_sock_test 
Ignore socket rm errors on daemon suite teardown
Upstream-commit: 79b7062f0ad4490cdaecd52a786fba586a4f10a8
Component: engine
 2016-08-10 17:04:45 -04:00
Sebastiaan van Stijn fcebb07e97 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>
Upstream-commit: 06fa5c12e8a0a4a6ed5766ff123fff06343c603c
Component: engine
 2016-08-10 23:01:17 +02:00
Tonis Tiigi 28fcc3f1f9 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5673c53417d689704ca7b5715f5c4d549fdf710c
Component: engine
 2016-08-10 13:27:38 -07:00
Tonis Tiigi 0130526e07 vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
 2016-08-10 13:27:38 -07:00
Yong Tang e6d8343517 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>
Upstream-commit: f9ef1c892d2ed345ac8ab83977bc710a8c13d652
Component: engine
 2016-08-10 12:50:10 -07:00
Brian Goff f2ff00f808 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>
Upstream-commit: e34244842ca968ff96769d1b5eab52fecddee80d
Component: engine
 2016-08-10 15:18:35 -04:00
Tibor Vass fad1c60365 Merge pull request #25567 from justincormack/name_to_handle_at 
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
Upstream-commit: 19a3289250e5b22081439659d34f8bd4266ed0a3
Component: engine
 2016-08-10 12:02:23 -07:00
Tibor Vass db498d9dca Merge pull request #25550 from mrjana/net 
Retry creating dynamic networks if not found
Upstream-commit: 92b10b497cf272f8fd307e2e6cc1f27199f132cd
Component: engine
 2016-08-10 11:52:56 -07:00
Tibor Vass 874b6f9cd1 Merge pull request #25334 from crosbymichael/selinux-fedora 
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
 2016-08-10 11:40:33 -07:00
Alexander Morozov cb1c855c27 Merge pull request #23951 from allencloud/defer-os-file-close 
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
 2016-08-10 11:07:15 -07:00
Tibor Vass b3651d506c Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie 
Add support to install Docker on raspbian/jessie
Upstream-commit: a6aea68c35a6d0c27d2c299aaeff6aecd9a451e8
Component: engine
 2016-08-10 11:06:04 -07:00
Sven Dowideit ea87241cea Merge pull request #25569 from friism/fix-typo-in-security-doc 
update intro to say there are four things to consider
Upstream-commit: ce2ca236db87f8f580cb29be27b4f0b5341af0ca
Component: engine
 2016-08-10 10:34:43 -07:00
Tibor Vass 8095bfc379 Merge pull request #25553 from vieux/restart_plugin 
fix plugins restart on docker restart
Upstream-commit: 93b9b19204cc82a5b7205726f452020e209903d1
Component: engine
 2016-08-10 10:34:17 -07:00
Sebastiaan van Stijn 8ab414f46c Improve layout for runmetrics 
Change bullet-lists to tables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 29fb644c189d710823540a06128a1e0ff6c01282
Component: engine
 2016-08-10 18:42:43 +02:00
Michael Friis abb7fbbaec update intro to say there are four things to consider 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 9c37bf9f1fc28ef28dc62ea496e6f56dafcdfd89
Component: engine
 2016-08-10 08:45:24 -07:00
Vincent Demeester 5cad711215 Merge pull request #25563 from lixiaobing10051267/master100 
test container state timeout with 200 milliseconds
Upstream-commit: 414e3f3caba6068d9fcde068eb3240456bc0b3ad
Component: engine
 2016-08-10 15:32:55 +02:00
Vincent Demeester 3fbb0152cb Merge pull request #25406 from pwzgorilla/master 
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
Upstream-commit: 3b1f82b52d53814e5ab60928de052ae2dba63f28
Component: engine
 2016-08-10 14:07:30 +02:00
Vincent Demeester 77bffbde97 Merge pull request #25427 from yongtang/25404-service-update-env-add 
Fix `service update --env-add` issue
Upstream-commit: 59ca493121680212ab119cbf264fcdb75b699adf
Component: engine
 2016-08-10 14:07:05 +02:00
Justin Cormack d430eb5c8c 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>
Upstream-commit: c1ca124682a90f3306b34ad104ba80e413f7bf88
Component: engine
 2016-08-10 12:22:36 +01:00
lixiaobing10051267 7c36224e9c test container state timeout with 200 milliseconds 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 51f927d4e5007d11d71a9cd68a6b1e93828becc5
Component: engine
 2016-08-10 17:19:25 +08:00
mgniu 6e6c038441 use proto and addr replace protoAddrParts[0] and protoAddrParts[1] 
Signed-off-by: mgniu <mgniu@dataman-inc.com>
Upstream-commit: dc4dcf89d885bc9bbd936337318236768dea478b
Component: engine
 2016-08-10 16:03:00 +08:00
Sebastiaan van Stijn 058048cb32 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs 
Add delete and update API documentation
Upstream-commit: 2f167a760904f5cf4f6250a55aa8f735fba74594
Component: engine
 2016-08-10 08:01:13 +02:00
allencloud 1c502571ef add defer file.Close to avoid potential fd leak 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
 2016-08-10 08:36:09 +08:00
Jana Radhakrishnan 1ea11295f3 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>
Upstream-commit: 117cef5e9766d6ba228770c225e816c6afd16ff8
Component: engine
 2016-08-09 13:37:11 -07:00
Alexander Morozov b9457de055 Merge pull request #25518 from yuexiao-wang/add-debug-info 
add more info for debugging
Upstream-commit: eb28dde01f165849bf372e18200e83042c76f26c
Component: engine
 2016-08-09 11:56:09 -07:00
Victor Vieux 2921fa6d1b fix plugin restart on docker restart 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: ab12ed4a5642edb4d96b54b6152f12260093f3ea
Component: engine
 2016-08-09 11:49:28 -07:00
Sebastiaan van Stijn b9dc82dd29 Merge pull request #25415 from avaid96/exitret 
added functionality to interrupt the terminal when it is waiting for …
Upstream-commit: 91853e44aeb20e55bcfcad5041c274783fdc06bc
Component: engine
 2016-08-09 16:47:54 +02:00
Sebastiaan van Stijn bc307a89de Merge pull request #25461 from coolljt0725/fix_update_mem 
Fix update memory without memoryswap
Upstream-commit: 8233e2b54d8c88d9c5845cbd30d54e7d5d8cb852
Component: engine
 2016-08-09 16:02:55 +02:00
Sebastiaan van Stijn fe7b1d72f0 Merge pull request #23391 from Microsoft/WindowsSandboxSize 
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
 2016-08-09 15:34:39 +02:00
Sebastiaan van Stijn 1934f7b605 Merge pull request #25530 from thaJeztah/docs-update-image-load-response 
docs: add missing "quiet" parameter for image/load and update response
Upstream-commit: 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4
Component: engine
 2016-08-09 15:26:16 +02:00
Sebastiaan van Stijn c2f89488d6 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output 
Update example output for node inspect
Upstream-commit: 80c49d1e5206eabf314069c262f7f643adf021e1
Component: engine
 2016-08-09 15:24:43 +02:00
Vincent Demeester 7cd50dad87 Add delete and update API documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: da325c035df5f9d733c130bb57065cad2c9bf7fc
Component: engine
 2016-08-09 14:50:46 +02:00
Sebastiaan van Stijn 46019ac375 Update example output for node inspect 
commit 41d580c7a610d8111dc63353cbd94319ca854627 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>
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
 2016-08-09 13:04:35 +02:00
Sebastiaan van Stijn aae342284e Merge pull request #25512 from diogomonica/add-created-at 
Adding Joined at to node inspect --pretty
Upstream-commit: 41d580c7a610d8111dc63353cbd94319ca854627
Component: engine
 2016-08-09 12:56:32 +02:00
Sebastiaan van Stijn 8f318a17a5 Merge pull request #25515 from WeiZhang555/fix-typo 
Fix typo
Upstream-commit: c3fdb701287eca00074e41dbc1bb011513479395
Component: engine
 2016-08-09 12:47:34 +02:00
Sebastiaan van Stijn d4747af3dc docs: add missing "quiet" parameter for image/load and update response 
Progress reporting during image load was added
in 415dd8688618ac2b3872c6a5b5af3afcef2c3e10, but
the corresponding query-parameter was not documented
in the API docs.

This updates the API docs, and adds a response example
both with quiet enabled and disabled.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d13ed38471decb332e9a0872854a97730d548583
Component: engine
 2016-08-09 12:08:33 +02:00
Sebastiaan van Stijn 62e3be9da8 Merge pull request #25527 from thaJeztah/fix-image-load-api-docs 
docs: add missing content-type header for image load
Upstream-commit: 5fd483695f8d5ffa297f40730f21031f629333e7
Component: engine
 2016-08-09 11:31:55 +02:00