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

25567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Durrheimer
282dda382b Remove zsh completion for 'docker swarm inspect' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit f146f6127c)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:43 -07:00
Sebastiaan van Stijn
798e0b07cb Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f0230049f0)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:43 -07:00
Anusha Ragunathan
4d529895f0 Make daemon events listen for plugin lifecycle events. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 42abccb841)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:43 -07:00
Akihiro Suda
49d9a425d5 Fix pkg/plugins TLSConfig panic 
Fix #25046

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit b1e71bdd1d)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:42 -07:00
Anusha Ragunathan
a577a06403 Check for plugin state before enable and disable. 
This prevents unnecessary API call to containerd.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit b867f6c6e1)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:42 -07:00
Tibor Vass
bdc0a24156 Vendor engine-api and swarmkit for 1.12.1 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:30 -07:00
Alexander Morozov
af4ff2541a integration: drain node before stop in TestApiSwarmForceNewCluster 
It's too long to wait for reschedule.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 307b7b0d15)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:48:17 -07:00
Sebastiaan van Stijn
6811254691 Merge pull request #25588 from thaJeztah/fix-events-since-description 
Fix events "since" query parameter description
(cherry picked from commit 960b7de456)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md

(cherry picked from commit 006f50ae27)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Sven Dowideit
8cc5797894 Merge pull request #25569 from friism/fix-typo-in-security-doc 
update intro to say there are four things to consider
(cherry picked from commit ce2ca236db)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 7cee444f8b)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
7bd1512ad6 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs 
Add delete and update API documentation
(cherry picked from commit 2f167a7609)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md

(cherry picked from commit ee59531352)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
4e6e046035 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output 
Update example output for node inspect
(cherry picked from commit 80c49d1e52)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit adf552821a)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Vincent Demeester
1ad0903ea3 Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide 
add force remove to admin guide, clean up usage of Raft, cluster -> s…
(cherry picked from commit 59b03240b1)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/swarm/admin_guide.md

(cherry picked from commit 0f65b6b137)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Vincent Demeester
74e965afd8 Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo 
fix typo, change sample cert expiry value
(cherry picked from commit e62b945013)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit f72a1eb6be)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
39d7e266de Merge pull request #25530 from thaJeztah/docs-update-image-load-response 
docs: add missing "quiet" parameter for image/load and update response
(cherry picked from commit 06e3ea1417)
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:25 -07:00
Sebastiaan van Stijn
f558e71cd2 Merge pull request #25527 from thaJeztah/fix-image-load-api-docs 
docs: add missing content-type header for image load
(cherry picked from commit 5fd483695f)
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
037ad1b174 Merge pull request #25506 from sfsmithcha/fix_network_name 
fix overlay network example
(cherry picked from commit c51f639531)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
33cabf2658 Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory 
update D4M D4W advisory in swarm tutorial
(cherry picked from commit e4bca49356)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
c01379f52f Merge pull request #25441 from thaJeztah/sync-api-docs 
Sync API docs to older API versions
(cherry picked from commit f4575970a7)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
d32508f2a1 Merge pull request #25435 from kfr2/fix-run-docs-typo 
Fix typo in run command documentation
(cherry picked from commit 0af3ca6933)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
cfd105cd5b Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker 
Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 4981916546)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
4b9b07f281 Merge pull request #25425 from thaJeztah/remove-rc-suffix 
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
fff3dce95f Merge pull request #25421 from avaid96/patch-1 
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
(cherry picked from commit 4191b786c5)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:21 -07:00
Sebastiaan van Stijn
bc967c6ea9 Merge pull request #25405 from thaJeztah/fix-api-markdown 
Fix Markdown formatting in API docs
(cherry picked from commit 66671d4ec2)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:21 -07:00
Brian Goff
0faacf1180 Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output 
Update `service ps` output format in swarm tutorial to match 1.12.0
(cherry picked from commit e1b77bd69a)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:20 -07:00
Brian Goff
8e04d5a68c Merge pull request #25376 from sfsmithcha/fix_typo 
add missing period
(cherry picked from commit f7d48d74a3)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:20 -07:00
Sebastiaan van Stijn
222e44179c Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes 
Update `/node/*` api reference documentation
(cherry picked from commit 0ab06816ea)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.24.md
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
85b9530e26 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa942)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
9aabd9c3f4 Merge pull request #24736 from johnharris85/fix-sinatra-tutorial 
Fix broken gem instructions.
(cherry picked from commit 29648795cd)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
60db5f060e Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update 
[Carry 24314] Make MongoDB sample Dockerfile working again
(cherry picked from commit 6e19e7b1d7)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
514c1da2bf Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update 
[carry 25174] 409 status code result to create service
(cherry picked from commit 2cb1281a4a)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.24.md
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
5cad6c1df8 Merge pull request #25318 from lixiaobing10051267/masterParentheses 
A parenthesis omitted in Seccomp.md
(cherry picked from commit d7c9c85e30)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:17 -07:00
Sven Dowideit
d7a01cc60e Merge pull request #25282 from clhlc/clhlc-patch-1 
Update swarm-mode.md
(cherry picked from commit 181f5ac627)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:17 -07:00
Sven Dowideit
7ab84e8daf Merge pull request #25241 from jhorwit2/jah/ps-doc-fix 
Added shutdown to desired-state docs for filter node/service ps
(cherry picked from commit 1d8617a42b)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:16 -07:00
Vincent Demeester
5f38d112fc Merge pull request #25269 from allencloud/update-remote-api-docs-about-409 
add status code 409 in attach in docs
(cherry picked from commit 56cbfc587f)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
 2016-08-11 16:32:16 -07:00
Tõnis Tiigi
a4c8fe1cd4 Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance 
Fix swarm manager node fault tolerance table
(cherry picked from commit ceb4126aa0)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:15 -07:00
Charles Smith
cdfde82612 Merge pull request #25205 from lixiaobing10051267/masterPath 
Give the correct link of docker swarm init
(cherry picked from commit 93fea86d1d)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:15 -07:00
Vincent Demeester
e118034053 Merge pull request #25239 from dlech/patch-1 
Make it clear which parmeter is the user
(cherry picked from commit c7fcf496af)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:15 -07:00
Sebastiaan van Stijn
9c2ba289dd Merge pull request #25020 from jfrazelle/update-non-events 
update security non-events
(cherry picked from commit 14664beda9)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:14 -07:00
Charles Smith
5f3b3d651c Merge pull request #25182 from sfsmithcha/clarify_join_token 
Author Merge add advertise address, clarify join token

CI errors expected.
(cherry picked from commit ee355e017d)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:14 -07:00
Charles Smith
1a5acb35e7 Merge pull request #25197 from sfsmithcha/add_services_guide 
author merge: add services guide to manage a swarm
(cherry picked from commit 8b69d50c79)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:13 -07:00
Sven Dowideit
ddbc9c7d88 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a 
modifed d4mac and d4win download links to stable for v1.12
(cherry picked from commit 352c720d69)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:13 -07:00
Tibor Vass
8eab29edd8 Bump VERSION to v1.12.0 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-28 14:06:23 -07:00
Tibor Vass
3c292b6d92 Merge pull request #25191 from mavenugo/1.12.dl 
Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock
 2016-07-28 13:59:20 -07:00
Madhu Venugopal
4f369a74fa Vendoring libnetwork to avoid a deadlock 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-28 12:02:09 -07:00
Tibor Vass
cd22bb863c Merge pull request #25178 from crosbymichael/bump-restore 
Check if the container is running if no event
 2016-07-28 11:13:37 -07:00
Michael Crosby
eddee8e932 Check if the container is running if no event 
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).

This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.

This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-07-28 09:22:51 -07:00
Justin Cormack
664fcd9f28 Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picks 
1.12.0 final cherry picks
 2016-07-28 00:21:36 +01:00
Tibor Vass
f399272f7b Merge pull request #25149 from tiborvass/1.12-changelog-fix 
Add some ommissions to CHANGELOG and update some swarm commands
 2016-07-27 15:28:46 -07:00
Madhu Venugopal
29f6886e48 Vendoring libnetwork to fix #25109 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit b1ae883d3f)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:55:30 -07:00
Charles Smith
7f6a1d9fb7 update rolling update tutorial to reflect default parallelism and update on failure 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 6440cacd49)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-27 14:55:30 -07:00