toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,024 Commits 3 Branches 295 Tags
1e82fd4fe9afe4ca5c321d6eba25df4f1fccfa00
Commit Graph
26024 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 1e82fd4fe9 Merge pull request #25021 from dmcgowan/fix-24951 
Fix calculation of relative path for symlink on docker save
Upstream-commit: 3c038318e535ac8e629499a145e686c833a34e75
Component: engine
 2016-07-25 22:24:45 -07:00
Tibor Vass 7501db1754 Merge pull request #25036 from nishanttotla/describe-function-update-executor 
Using map to list plugins in node description
Upstream-commit: 301eba03e1f30e72e85b9c33b1d02476efad341d
Component: engine
 2016-07-25 22:19:33 -07:00
Tibor Vass 09945aead8 Merge pull request #24967 from mavenugo/eligiblenet 
improve error message when using ineligible network with service create
Upstream-commit: 1afa8195936e8988a61bea5cf753ec8a7aaaf5fa
Component: engine
 2016-07-25 21:02:24 -07:00
Tibor Vass 088c389905 Merge pull request #25030 from stevvooe/allow-cancellation-propagation 
swarm/controller: allow cancellation to propagate
Upstream-commit: a6a261261d94748b9c3eb06ddb1f64f426eec43b
Component: engine
 2016-07-25 19:50:32 -07:00
Stephen J Day 6a43c7c1ad swarm/controller: allow cancellation to propagate 
Ensure that cancellation of a pull propagates rather than continuing to
container creation. This ensures that the `Prepare` method is properly
re-entrant.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: d99c6b837ffd18ffe5bce801feb4936bf0edd2aa
Component: engine
 2016-07-25 18:31:24 -07:00
Tibor Vass b94b8fd3fd Merge pull request #25023 from cpuguy83/25022_fix_label_panic 
fix panic on --label-add
Upstream-commit: afac3361dc66b0fd0c3910f89d0d7e8156b37e24
Component: engine
 2016-07-25 18:13:15 -07:00
Nishant Totla 2de0b34d83 Using map to list plugins in node description 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: feedb7ab5a139ba492a9b896e8efdc0b9ddc43b2
Component: engine
 2016-07-25 17:45:32 -07:00
Brian Goff d759fd7b51 Merge pull request #24545 from runshenzhu/health-check 
swarm: block controller.Start until container is healthy
Upstream-commit: a4634cd8a8edb9be9c73dc552e045fa868a861f7
Component: engine
 2016-07-25 20:32:27 -04:00
Tibor Vass 5c65165a26 Merge pull request #24856 from tiborvass/remove-status-2-from-healthcheck 
healthcheck: do not interpret exit code 2 as "starting"
Upstream-commit: 8c7468bf3b5f828503b1e284475d2f3c6f1cdd63
Component: engine
 2016-07-25 16:34:43 -07:00
Brian Goff d2f3f931f0 fix panic on --label-add 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 85bc3194aa12c19a5bd755666d1e9617dc1bb322
Component: engine
 2016-07-25 19:20:44 -04:00
runshenzhu 5a95df9753 extend health check to start service 
Signed-off-by: runshenzhu <runshen.zhu@gmail.com>
Signed-off-by: Runshen Zhu <runshen.zhu@gmail.com>
Upstream-commit: a99db84b4a966f0f09e81c446e857323a2a3302c
Component: engine
 2016-07-25 15:49:22 -07:00
Tibor Vass 79e9eedbda Merge pull request #25018 from nishanttotla/stable-node-description-swarmkit 
Sort plugin names in node description
Upstream-commit: ebb157ec463752d1766fcb19818d6ddd34ce3444
Component: engine
 2016-07-25 15:45:25 -07:00
Tibor Vass 11cd397072 healthcheck: do not interpret exit code 2 as "starting" 
Instead reserve exit code 2 to be future proof, document that it should
not be used. Implementation-wise, it is considered as unhealthy, but
users should not rely on this as it may change in the future.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 91e9f3831330c63f8351b9fc3f7c31b3229505be
Component: engine
 2016-07-25 14:28:45 -07:00
Vincent Demeester 7ebd4850f0 Merge pull request #24949 from Microsoft/jjh/tasklist-tlist 
Windows: nanoserver TestBuildCmdShellArgsEscaped
Upstream-commit: 8f11896a45aea554935353cb1347cc2aa2529395
Component: engine
 2016-07-25 22:58:09 +02:00
Derek McGowan 6fbcd4c5d4 Fix calculation of relative path for symlink on docker save 
Relative paths are now calculated from a base path rather than from the file path, which gets treated like a directory.
Symlinks will now properly point to the file as "../<layer dir>/layer.tar" rather the incorrect "../../<layer dir>/layer.tar".

Fixes #24951

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5487881e120e927d7210adf0cb09181092c3ab35
Component: engine
 2016-07-25 13:28:10 -07:00
Nishant Totla 38618da388 Sort plugin names in node description 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 227c7e4e8d8ce9ecb74ff1b38fe07cd6c37aee9f
Component: engine
 2016-07-25 10:38:24 -07:00
Sebastiaan van Stijn fb8417c213 Merge pull request #24857 from abronan/swarm_admin_docs 
Swarm docs: add administration guide for Managers and Raft
Upstream-commit: e3064665694e79534bba3a4dffdc77c52c0623b4
Component: engine
 2016-07-25 19:28:21 +02:00
Alexandre Beslic e6c9a862fe swarm docs: add administration guide for Managers and Raft 
This adds a guide with recommendations on how to setup
Managers and keep the Swarm cluster healthy.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
Upstream-commit: 24f87f26e73a49383e0606813a86ed96da7f5a18
Component: engine
 2016-07-25 10:25:33 -07:00
Sebastiaan van Stijn 68e6d452a1 Merge pull request #24207 from sfsmithcha/add_swarm_mode_guide 
add run swarm mode guide
Upstream-commit: caedb3f827335532a4b0aa9bebc56223dbc53aa7
Component: engine
 2016-07-25 19:21:01 +02:00
Tibor Vass 614fc25c93 Merge pull request #24943 from aaronlehmann/rolling-updates 
Add failure action for rolling updates
Upstream-commit: c65925f24baf98455c211b4eb5c408daaaefb07a
Component: engine
 2016-07-25 10:15:28 -07:00
Tibor Vass 7035b55d1b Merge pull request #24908 from jhorwit2/jah/24903 
Treat HEALTHCHECK NONE the same as not setting a healthcheck
Upstream-commit: 79de4d2186ff35579b9d6c19f7f89582dc6a95d6
Component: engine
 2016-07-25 10:14:38 -07:00
Sebastiaan van Stijn 3bb81734cb Merge pull request #25012 from aanand/entrypoint-note 
Add note about --entrypoint overriding default command
Upstream-commit: 131557309302fe237276a479b55a75507f21d41c
Component: engine
 2016-07-25 19:11:24 +02:00
Charles Smith 23a8cb555d add run swarm mode guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: c406711cc0c5c47f2a36a54becae49c24e0c31c9
Component: engine
 2016-07-25 10:10:11 -07:00
Michael Crosby 94c36eb295 Merge pull request #24942 from anusha-ragunathan/plugin-liverestore 
Handle plugin shutdown when liveRestore is set.
Upstream-commit: b6197e951498eed717ee550387c34e9a8e6350ed
Component: engine
 2016-07-25 09:49:34 -07:00
Michael Crosby 808751101d Merge pull request #24984 from mlaventure/fix-restore-without-restore 
Fix restoring behavior when live-restore is not set
Upstream-commit: e95d0b6bf1af45cef57a2f46f6913c1387bc9365
Component: engine
 2016-07-25 09:49:12 -07:00
Tibor Vass c579261757 Merge pull request #24917 from aluzzardi/improve-service-error-reporting 
service tasks: Improve error reporting
Upstream-commit: 087ca1b3b79ab032cf75543ef48bdb15cb236a33
Component: engine
 2016-07-25 09:44:08 -07:00
Aanand Prasad 77f65011eb Add note about --entrypoint overriding default command 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 2b7548f97298565bd57a9c26e4eba3aa6e23f8a5
Component: engine
 2016-07-25 17:21:23 +01:00
Aaron Lehmann f72c6bff06 Add failure action for rolling updates 
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 57ae29aa74e77ade3c91b1c77ba766512dae9ab4
Component: engine
 2016-07-25 08:51:19 -07:00
Madhu Venugopal f20d0fff16 Merge pull request #25003 from thaJeztah/make-network-error-less-DRY 
make network errors less DRY
Upstream-commit: 3e7d86492501bff7e64288e42cf8cd70821fd59e
Component: engine
 2016-07-25 08:47:29 -07:00
Madhu Venugopal 4d19e2a5c0 improve error message when using ineligible network with service create 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 40c88b8c54fe4595f8bda5417ced3729eea5b16e
Component: engine
 2016-07-25 08:31:22 -07:00
Josh Horwitz a43b617d89 Treat HEALTHCHECK NONE the same as not setting a healthcheck 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 4016038bd323a4ef4ee8d0af8da5dafd88ab1721
Component: engine
 2016-07-25 11:11:14 -04:00
Brian Goff 7804833e8f Merge pull request #24997 from WeiZhang555/fix-unmeaningful-log 
small nit: fix unmeaningful log
Upstream-commit: 19ec73b8b5e08d24edcd0eb886fa514d2678741a
Component: engine
 2016-07-25 10:33:57 -04:00
Zhang Wei 5d53107934 small nit: fix unmeaningful log 
Truncated dir name can't give any useful information, print whole dir
name will.

Bad debug log is like this:

```
DEBU[2449] aufs error unmounting /var/lib/doc: no such file or directory
```

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: af8359562c9561afad0a05e66386588d17788804
Component: engine
 2016-07-26 07:10:28 +08:00
Sebastiaan van Stijn f82a46e7d6 make network errors less DRY 
There's existing code to generate these
kind of errors, so make the errors added
in commit cc493a52a46271df82dbebea26038502b85788b9
less DRY.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3fa9d77bf312652ae04e902a2b6e73a0b91ec007
Component: engine
 2016-07-25 16:22:08 +02:00
Vincent Demeester 595a65bbea Merge pull request #25002 from thaJeztah/add-new-errors-to-api-docs 
Add new error to API docs
Upstream-commit: e64f5f97fc9dabfaea8907cf2913bd9cd999f3f6
Component: engine
 2016-07-25 16:00:36 +02:00
Brian Goff 52cb6d0182 Merge pull request #23908 from capkurmagati/fix-docker-stats 
Fix high cpu usage caused by docker stats.
Upstream-commit: 11501fa60c6600dcb38acafad3f6a86bc49af75a
Component: engine
 2016-07-25 09:54:00 -04:00
Sebastiaan van Stijn d2c0d3d29a Merge pull request #23844 from tjanez/docs-systemd-expand 
Expand instructions on using systemd to manage containers
Upstream-commit: 42f2205184e31390fc13cc21aedf95fcc3e9e878
Component: engine
 2016-07-25 14:39:45 +02:00
Sebastiaan van Stijn a4faf39b6e Add new error to API docs 
Commit cc493a52a46271df82dbebea26038502b85788b9 added
a constraint to network connect/disconnect operations
on "Swarm scoped" networks.

This adds those errors to the API documentation. Also
changes the error to lowercase for consistency.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b0089e48272f18d856ba147b393371c18d5683fb
Component: engine
 2016-07-25 12:04:55 +02:00
Vincent Demeester 2b15ca3027 Merge pull request #24990 from mavenugo/rc5ln 
Vendoring libnetwork for rc5
Upstream-commit: 3056e4884e470a43eb71584569d920d4abfde4d0
Component: engine
 2016-07-25 11:43:59 +02:00
Sebastiaan van Stijn 089e283622 Merge pull request #24988 from mavenugo/snconnect 
Prevent network connect/disconnect on swarm scoped networks
Upstream-commit: cc493a52a46271df82dbebea26038502b85788b9
Component: engine
 2016-07-25 10:46:45 +02:00
Sebastiaan van Stijn c56d1bfde3 Merge pull request #24991 from everett-toews/fix-AuthzPlugin 
Fix AuthzPlugin URL fragment in docs
Upstream-commit: 4b94a6cb162d43f83cb06520fea24c1659be5ad9
Component: engine
 2016-07-25 10:32:03 +02:00
Vincent Demeester b6548fce21 Merge pull request #24961 from jstarks/vt_th2_fix 
Windows: Restore console mode on set mode failure
Upstream-commit: bff9a0556f785b094b55fcc9c1e5f83cf74a9aaa
Component: engine
 2016-07-25 09:49:34 +02:00
Vincent Demeester d204454a26 Merge pull request #24977 from lixiaobing10051267/masterNote 
Modify several fun notes in fsnotify.go
Upstream-commit: 1f3b400d3c92657a915610a3702cdf4012beffbd
Component: engine
 2016-07-25 09:41:17 +02:00
Vincent Demeester 8e3d8789cb Merge pull request #24963 from allencloud/fix-typos 
fix typos
Upstream-commit: 40044cb18fd4ff0ed13d8cdd41ec4dcecdac0703
Component: engine
 2016-07-25 09:39:48 +02:00
Vincent Demeester 4135b50d84 Merge pull request #24994 from sdurrheimer/zsh-completion-swarm-join-token 
Add zsh completion for 'docker swarm join-token' command
Upstream-commit: 642925f69b177054f7e28181e7dfd3ade58b94f3
Component: engine
 2016-07-25 09:37:44 +02:00
Steve Durrheimer 361aaddf98 Add zsh completion for 'docker swarm join-token' command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a04bba8b89f12480c4eaf0dda8f47442f99864ca
Component: engine
 2016-07-25 08:39:33 +02:00
Everett Toews c0405374cf Fix AuthzPlugin URL fragment in docs 
These docs have AuthzPlugin with a lower case 'z'. What the plugin
api is actually looking for is AuthZPlugin with an upper case 'Z'.

See https://github.com/docker/docker/blob/46e3a249a1971f8697ca338c9b02e27d36ddab12/pkg/authorization/api.go#L5-L8

Signed-off-by: Everett Toews <everett.toews@rackspace.com>
Upstream-commit: c42fbc6b0906c7ccafe5a35d9c2288f83361849d
Component: engine
 2016-07-24 23:03:19 -05:00
Madhu Venugopal 439155a37c Vendoring libnetwork for rc5 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 56b78ab2f2871707ebdf33802a3029417b43036e
Component: engine
 2016-07-24 20:08:00 -07:00
Madhu Venugopal cf6ff5cc28 Prevent network connect/disconnect on swarm scoped networks 
Swarm handles service updates quite differently and also it doesnt
support worker driver network operations. Hence prevent containers from
connecting to swarm scoped networks

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8f9066c468d7312af722c7cf9fc27b7c8ab79fc3
Component: engine
 2016-07-24 15:34:45 -07:00
Aaron Lehmann f5ade81f8f Revendor engine-api 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3585026c3a01928a0e5a22e893af5f52c75e1a85
Component: engine
 2016-07-24 11:13:13 -07:00