toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,049 Commits 3 Branches 295 Tags
c402160cdbdcbb73bc7a1beb230f0f8c0f6ecd5a
Commit Graph
26049 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lixiaobing10051267 c402160cdb Add break after found = true 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 8928677ea2b4e69ecfd96a2c951a33e46b7b7388
Component: engine
 2016-07-26 23:28:44 +08:00
Sebastiaan van Stijn 7a976a60f2 Merge pull request #24950 from dnephin/make-manpages-in-container 
Make manpages in a container when creating deb/rpm
Upstream-commit: 1e83886dd52f92e8ea738b33ec6ec6bd992c1263
Component: engine
 2016-07-26 14:34:14 +02:00
Sebastiaan van Stijn ed486e4e8a Merge pull request #25060 from albers/completion-swarm-inspect 
Remove bash completion for `docker swarm inspect`
Upstream-commit: 00295c4bb3e1399d3e0edd89a1ae52c1bcf2e28e
Component: engine
 2016-07-26 13:56:11 +02:00
Harald Albers 6b65af2d20 Remove bash completion for docker swarm inspect 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b
Component: engine
 2016-07-26 04:51:27 -07:00
Sebastiaan van Stijn 6d48e146d0 Merge pull request #25059 from albers/completion-service-labels 
bash completion for container labels to `service {create,update}`
Upstream-commit: 238ecaf008c5bf483f68838ff6a213a3ae1f77a4
Component: engine
 2016-07-26 13:51:02 +02:00
Harald Albers 6776aff799 bash completion for container labels to service {create,update} 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 13c138ec2a896a87da8fa81693975e7ffbec85fd
Component: engine
 2016-07-26 04:45:57 -07:00
Tibor Vass ce5e5d9c75 Merge pull request #25051 from dmcgowan/fix-untag-without-force-while-container-running 
Fix untag without force while container running
Upstream-commit: bad654b00c954e31007c5004629e236c06ca4046
Component: engine
 2016-07-26 02:12:10 -07:00
Tibor Vass 688b7fe3c1 Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5 
Vendor swarmkit for 1.12.0-rc5
Upstream-commit: 9fc2eee2b5b3c0cbc392a7ce6c085984871fb770
Component: engine
 2016-07-26 01:47:34 -07:00
Vincent Demeester 37537a72ff Merge pull request #25047 from aaronlehmann/unsafe-flag-updates 
service update: Don't assume existing pointers in spec are valid
Upstream-commit: f0173abd3690638589df969d8d9a76d1a524d39c
Component: engine
 2016-07-26 10:14:29 +02:00
Tibor Vass 154089229d Merge pull request #25042 from tiborvass/carry-24492 
Carry 24492: Remove swarm inspect and use info instead
Upstream-commit: 9ee430fcf5bd8e2afc6896bb2e0d12c1226c56c2
Component: engine
 2016-07-26 01:11:37 -07:00
Tibor Vass 326610d0c6 Merge pull request #25043 from stevvooe/forked-pull-context 
container/controller: avoid cancellation with forked pull context
Upstream-commit: 7bb9676a2bab9517f06abf849cbe6e4337484a15
Component: engine
 2016-07-26 01:01:09 -07:00
Derek McGowan ea3b59a83b Fix untag without force while container running 
With digests being added by default, all images have multiple references.
The check for whether force is required to remove the reference should use the new check for single reference which accounts for digest references.
This change restores pre-1.12 behavior and ensures images are not accidentally left dangling while a container is running.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 1f7a9b1ab3d261de5be7d490e7e4f978f317242f
Component: engine
 2016-07-26 00:45:39 -07:00
Aaron Lehmann 633f464bc8 Vendor swarmkit for 1.12.0-rc5 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 60496af7118d91b04c4fd5a7e50150a76ad9abaf
Component: engine
 2016-07-26 00:45:07 -07:00
Aaron Lehmann c877e07205 service update: Don't assume existing pointers in spec are valid 
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>
Upstream-commit: f9c920a1266197c2b6f0378b58f22246037fda7a
Component: engine
 2016-07-25 23:56:50 -07:00
Tibor Vass 5427ebad21 Address some displaying issues in docker info 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8ad9438edeab44c8f424113bc96fa12d76e4fdc6
Component: engine
 2016-07-25 23:07:39 -07:00
Tibor Vass 2db4d18c3a Merge pull request #25041 from mavenugo/rip 
Vendoring libnetwork to remove stale xfrm states
Upstream-commit: 4144e11d3205ef45bedc3f7bf04da5d6a24ec342
Component: engine
 2016-07-25 23:05:58 -07:00
Tibor Vass cc327ab9d4 Merge pull request #25038 from tiborvass/carry-25001 
Carry 25001: Add container labels to service create/update
Upstream-commit: 5a8f2ac86e60cc256b24d51fadada5badabcaf46
Component: engine
 2016-07-25 23:05:20 -07:00
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
Stephen J Day bff0a1048f container/controller: avoid cancellation with forked pull context 
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>
Upstream-commit: d8d71ad5b94d44a2778f2d8989424259cac94e9b
Component: engine
 2016-07-25 21:52:10 -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
Vincent Demeester eb900df556 Remove swarm inspect and use info instead 
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>
Upstream-commit: e6923f6d75c2bd1b22cc1229214ffceca3251cc6
Component: engine
 2016-07-25 20:31:10 -07:00
Tibor Vass f2c5e83113 vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e3c150bd470162d7a1a168f125a5e9a3b32b6a00
Component: engine
 2016-07-25 20:31:10 -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
Madhu Venugopal 3d4bb9ff3f Vendoring libnetwork to remove stale xfrm states 
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>
Upstream-commit: 6a754a4eef4463ed7c712a1ebe5bc38e2a957c42
Component: engine
 2016-07-25 19:44:07 -07:00
Tibor Vass 9b426d8e40 Prevent panic on update --container-label-add 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e462b4507a7020ae96ec4f4806877bff3a0cae99
Component: engine
 2016-07-25 19:17:06 -07:00
Vincent Demeester 0750a492c1 Add container labels to service create/update 
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>
Upstream-commit: 4031d70d1be2f02e1c9d6f7738f2a816be7eeef2
Component: engine
 2016-07-25 18:57:02 -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