summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25191 from mavenugo/1.12.dlbump_v1.12.0Tibor Vass2016-07-282-2/+3
|\ | | | | Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock
| * Vendoring libnetwork to avoid a deadlockMadhu Venugopal2016-07-282-2/+3
|/ | | | Signed-off-by: Madhu Venugopal <madhu@docker.com>
* Merge pull request #25178 from crosbymichael/bump-restoreTibor Vass2016-07-281-5/+13
|\ | | | | Check if the container is running if no event
| * Check if the container is running if no eventMichael Crosby2016-07-281-5/+13
|/ | | | | | | | | | | | | | | 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>
* Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picksJustin Cormack2016-07-2819-113/+170
|\ | | | | 1.12.0 final cherry picks
| * Vendoring libnetwork to fix #25109Madhu Venugopal2016-07-273-1/+11
| | | | | | | | | | | | Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit b1ae883d3f8c35f9142966af7bf5278e7a10b268) Signed-off-by: Tibor Vass <tibor@docker.com>
| * update rolling update tutorial to reflect default parallelism and update on ↵Charles Smith2016-07-271-16/+20
| | | | | | | | | | | | | | | | failure Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit 6440cacd49226e97b2dcb64eb31cb32b87b1ff18) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Fix daemon panic on restoring containersLei Jitang2016-07-271-0/+2
| | | | | | | | | | | | Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit c75de8e33cc0db5236eef6146f2de06533b46aa8) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Move directive out of globalsJohn Howard2016-07-279-74/+103
| | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com> Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 755be795b4e48b3eadcdf1427bf9731b0e97bed1) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Fix files in subdirectories creating bad whiteoutDerek McGowan2016-07-271-1/+2
| | | | | | | | | | | | | | | | Closes #23863 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) (cherry picked from commit 1c0f6653ba82c933885719478e90c13f8d7e32b7) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Update diff apply test to check sub directoriesDerek McGowan2016-07-272-3/+27
| | | | | | | | | | | | Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) (cherry picked from commit 5c05b8447d06793530e3d860b99a6e878685275a) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Remove the Require on the socket for the rpmMichael Crosby2016-07-271-1/+0
| | | | | | | | | | | | Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit 3cddda3bbb0cbc6f600b228b61e1110e0cf34c65) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Fix issue with test ordering for TestParseWordsBrian Goff2016-07-272-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `TestParseWords` needs to use the `tokenEscape` for one of the test cases, but `tokenEscape` was not being set unless tests ran in a specific order. This sets a default value for `tokenEscape`... `\`... so that tests that rely on this global are not affected by test ordering. This is the simplest fix for these cases. Ideally the token should not be set as a global but rather passed down, which is a much larger change. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit df167d3ff04cdc90012c8ca39647662ad69e6715) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Remove bash completion for `docker swarm inspect`Harald Albers2016-07-271-15/+0
| | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b) Signed-off-by: Tibor Vass <tibor@docker.com>
| * bash completion for container labels to `service {create,update}`Harald Albers2016-07-271-0/+3
| | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 13c138ec2a896a87da8fa81693975e7ffbec85fd) Signed-off-by: Tibor Vass <tibor@docker.com>
* | Merge pull request #25149 from tiborvass/1.12-changelog-fixTibor Vass2016-07-271-4/+8
|\ \ | |/ |/| Add some ommissions to CHANGELOG and update some swarm commands
| * Add some ommissions to CHANGELOG and update some swarm commandsTibor Vass2016-07-271-4/+8
| | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com>
* | Merge pull request #25145 from aaronlehmann/remove-join-tokens-from-infoTibor Vass2016-07-275-18/+32
|\ \ | | | | | | Carry #25134: Remove join-tokens from the /info API
| * | Remove join-tokens from the /info APIAaron Lehmann2016-07-275-18/+32
| | | | | | | | | | | | | | | | | | | | | join-tokens are not needed for this endpoint, and should not be as part of /info Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
* | | Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0Tibor Vass2016-07-2728-77/+103
|\ \ \ | |_|/ |/| | [bump-1.12.0] cli: `docker service|node|stack ps` instead of tasks
| * | cli: `docker service|node|stack ps` instead of tasksStephen J Day2016-07-2728-77/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than conflict with the unexposed task model, change the names of the object-oriented task display to `docker <object> ps`. The command works identically to `docker service tasks`. This change is superficial. This provides a more sensical docker experience while not trampling on the task model that may be introduced as a top-level command at a later date. The following is an example of the display using `docker service ps` with a service named `condescending_cori`: ``` $ docker service ps condescending_cori ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 13 minutes ago Running 6c6d232a5d0e ``` The following shows the output for the node on which the command is running: ```console $ docker node ps self ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE b1tpbi43k1ibevg2e94bmqo0s mad_kalam.1 mad_kalam apline Accepted 2 seconds ago Accepted 6c6d232a5d0e e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 12 minutes ago Running 6c6d232a5d0e 4x609m5o0qyn0kgpzvf0ad8x5 furious_davinci.1 furious_davinci redis Running 32 minutes ago Running 6c6d232a5d0e ``` Signed-off-by: Stephen J Day <stephen.day@docker.com> (cherry picked from commit 0aa4e1e68973ede0c73f8a4356e2a17fc903f549)
* | | Merge pull request #25144 from dnephin/remove-extraneous-aliases.bumpTibor Vass2016-07-272-11/+9
|\ \ \ | | | | | | | | [bump_v1.12.0] Remove extraneous mount aliases
| * | | Remove extraneous mount aliases.Daniel Nephin2016-07-272-11/+9
| | |/ | |/| | | | | | | Signed-off-by: Daniel Nephin <dnephin@docker.com>
* | | Merge pull request #25103 from tiborvass/fix-bad-cherry-pick-infoTibor Vass2016-07-272-217/+14
|\ \ \ | |/ / |/| | Fix bad cherrypick from a91bc28e6225fb0d943451b8bdafca8b6bbb047d
| * | Fix bad cherrypick from a91bc28e6225fb0d943451b8bdafca8b6bbb047dTibor Vass2016-07-262-217/+14
| | | | | | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com>
* | | Merge pull request #25114 from SvenDowideit/bump_v1.12.0-docsTibor Vass2016-07-2752-384/+750
|\ \ \ | |_|/ |/| | Bump v1.12.0 docs
| * | Add back links to 1.12 release in deprecated.mdSebastiaan van Stijn2016-07-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These links were temporarily changed, because the docs were published before the 1.12.0 tag was available. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | Remove release-candidate advisoriesSebastiaan van Stijn2016-07-2723-49/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 053ac127ab0f784bebeda38f29f2d7615d2ffcb8) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> Conflicts: docs/reference/api/docker_remote_api_v1.25.md docs/reference/commandline/service_create.md
| * | fix minor docs issuesSebastiaan van Stijn2016-07-272-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this brings back the trailing whitespace in "runmetrics", that were there intentially to force a line-break also removes a duplicate redirect, that was present on two pages Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit d8434eba462752327d4c7769d3ce2c85013c211e) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | fix the ipaddress of an explanation.mapk0y2016-07-271-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: mapk0y <mapk0y@gmail.com> (cherry picked from commit a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | add how services work to how swarm mode works guideCharles Smith2016-07-2710-2/+106
| | | | | | | | | | | | | | | | | | Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit bef36fba4022e1c37f1f21e9e265e7f98e2f7f65) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | add swarm manage nodes guideCharles Smith2016-07-275-9/+230
| | | | | | | | | | | | | | | | | | Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit 704facbbab0af520e0429eb75a6f875b6015a77c) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | add doc for live-restore setting and daemonless containers, fix admin guide menuCharles Smith2016-07-2715-323/+418
| | | | | | | | | | | | | | | | | | Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit cbd07495a3c5b49a47ea288a9e6ee9b24800cace) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | Make archive links absoluteSebastiaan van Stijn2016-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The archive is only available on docs.docker.com, and not when doing a "make docs", so relative links will not resolve. Making these links absolute, so that they always point to the live "docs.docker.com" domain. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4b090ae5f259dcedb946463a8512b2416a971fcb) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
| * | Update docker_remote_api_v1.22.mdMickaël FORTUNATO2016-07-273-3/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docker_remote_api_v1.23.md Update docker_remote_api_v1.24.md Update docker_remote_api_v1.25.md look like ExecDriver is not return anymore Signed-off-by: Mickaël Fortunato <morsi.morsicus@gmail.com> (cherry picked from commit 166928a24bf5f3b23103b8ad09f134e277c00d6a) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> Conflicts: docs/reference/api/docker_remote_api_v1.25.md
* | Merge pull request #25126 from mlaventure/fix-weird-rpc-lockSebastiaan van Stijn2016-07-271-16/+16
|\ \ | |/ |/| Attach stdin after attach stdout/err to avoid an rpc lock
| * Attach stdin after attach stdout/err to avoid an rpc lockKenfe-Mickael Laventure2016-07-261-16/+16
|/ | | | | | Reason of the lock is currently unknown Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
* Bump VERSION to v1.12.0-rc5v1.12.0-rc5Tibor Vass2016-07-261-1/+1
| | | | Signed-off-by: Tibor Vass <tibor@docker.com>
* Merge pull request #25063 from thaJeztah/man-page-cherryTibor Vass2016-07-263-5/+3
|\ | | | | cherry-pick manpages fix
| * Require manpages for packages.Daniel Nephin2016-07-262-4/+2
| | | | | | | | | | | | Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit 1ea9c19ffe53811931ecd3102703c3eacb22d14c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * Make manpages in a conatiner.Daniel Nephin2016-07-263-3/+3
|/ | | | | | Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit 7004f219f5d0fe99de0dadf319381d224866eb7c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #25058 from tiborvass/additional-cherrypicks-for-1.12.0-rc5Tibor Vass2016-07-2616-144/+184
|\ | | | | [bump_v1.12.0] Additional cherrypicks for 1.12.0 rc5
| * service update: Don't assume existing pointers in spec are validAaron Lehmann2016-07-261-11/+14
| | | | | | | | | | | | | | | | | | | | When updating values in the spec according to CLI flags, don't write into the existing pointers. They may be nil. Instead, update them to point to the new value we're writing. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit f9c920a1266197c2b6f0378b58f22246037fda7a) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Address some displaying issues in docker infoTibor Vass2016-07-261-2/+1
| | | | | | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit 8ad9438edeab44c8f424113bc96fa12d76e4fdc6) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Remove swarm inspect and use info insteadVincent Demeester2016-07-267-64/+32
| | | | | | | | | | | | | | | | | | Remove the swarm inspect command and use docker info instead to display swarm information if the current node is a manager. Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit e6923f6d75c2bd1b22cc1229214ffceca3251cc6) Signed-off-by: Tibor Vass <tibor@docker.com>
| * vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89Tibor Vass2016-07-262-1/+2
| | | | | | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit e3c150bd470162d7a1a168f125a5e9a3b32b6a00) Signed-off-by: Tibor Vass <tibor@docker.com>
| * container/controller: avoid cancellation with forked pull contextStephen J Day2016-07-261-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context cancellations were previously causing `Prepare` to fail completely on re-entrant calls. To prevent this, we filtered out cancels and deadline errors. While this allowed the service to proceed without errors, it had the possibility of interrupting long pulls, causing the pull to happen twice. This PR forks the context of the pull to match the lifetime of `Controller`, ensuring that for each task, the pull is only performed once. It also ensures that multiple calls to `Prepare` are re-entrant, ensuring that the pull resumes from its original position. Signed-off-by: Stephen J Day <stephen.day@docker.com> (cherry picked from commit d8d71ad5b94d44a2778f2d8989424259cac94e9b) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Vendoring libnetwork to remove stale xfrm statesMadhu Venugopal2016-07-262-3/+3
| | | | | | | | | | | | | | | | | | When using encrypted vxlan network, some of the xfrm states are left stale. This fix also filters out self advertise-addr rules. Signed-off-by: Madhu Venugopal <madhu@docker.com> (cherry picked from commit 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Prevent panic on update --container-label-addTibor Vass2016-07-261-2/+2
| | | | | | | | | | | | Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit e462b4507a7020ae96ec4f4806877bff3a0cae99) Signed-off-by: Tibor Vass <tibor@docker.com>
| * Add container labels to service create/updateVincent Demeester2016-07-265-48/+81
|/ | | | | | | | | Swarm mode makes it possible through the API to set labels to containers but not through command line. This tries to fix it. Signed-off-by: Vincent Demeester <vincent@sbr.pm> (cherry picked from commit 4031d70d1be2f02e1c9d6f7738f2a816be7eeef2) Signed-off-by: Tibor Vass <tibor@docker.com>
View Lorry Controller Status