toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,191 Commits 3 Branches 295 Tags
14aacd334bcabccb7b96fa4172423c8fdd4b303b
Commit Graph
29191 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bbayani 4b5f254c7b Clarify that ipmasq rules are not added when iptables is false 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: db3f06fd976d71a1d335278ecedf026aea6046c0
Component: engine
 2016-11-18 14:25:24 -08:00
Brian Goff 33ea65e4f5 Allow graphdriver plugins to use v2 
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.

This moves the initialization up before we create the graph driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 020b051dfb92edcb1e43cee77c881dd3e15481c0
Component: engine
 2016-11-18 17:23:59 -05:00
Victor Vieux b5a2933b08 Merge pull request #28590 from mlaventure/update-containerd 
Update containerd & runc
Upstream-commit: e67664887da4b9657ead8f8e39a6a6c3fe122c99
Component: engine
 2016-11-18 14:08:56 -08:00
Andrea Luzzardi b72665f309 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
 2016-11-18 13:32:26 -08:00
Sebastiaan van Stijn fd22b67295 swap position of "host" and "ip" 
the service definition uses the format as defined
in  http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])

This format is the _reverse_ of the format used in
the container API.

Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.

This fixes the order, and correctly sets it to;

    IP-Address hostname

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f1b9df91722a229fd0cefd7a0868933b6b811544
Component: engine
 2016-11-18 22:04:27 +01:00
Darren Stahl bee0ae1311 Shutdown instead of terminate process on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8b503242734d66a223bf8d694f26901b1d02106d
Component: engine
 2016-11-18 12:05:08 -08:00
Sean McIntyre 3cb0023957 Add HostConfig.Tmpfs to docs for container creation remote API 
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca>
Upstream-commit: 2c38d43eb5276a82f8e076058506468e0d5a2f9f
Component: engine
 2016-11-18 15:00:07 -05:00
Aaron Lehmann 71cdb489af Merge pull request #28421 from aaronlehmann/digest-pinning-warnings 
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
 2016-11-18 11:33:17 -08:00
Tõnis Tiigi 5c4a8ff562 Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking 
judge manager before unlocking
Upstream-commit: eb0fc787e699b20d884c8d0dc23a5392e5aeb1a8
Component: engine
 2016-11-18 11:27:48 -08:00
Evan Hazlett 8d6fcf9749 lint fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: eb036ea4db86c98d5b3f51e7d0d2424faaca0343
Component: engine
 2016-11-18 13:04:08 -05:00
Nishant Totla 4be5a5624f Suppressing digest for docker service ls/ps 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: e7d83fdb9a17c384397e81d7b5a83245b4216f79
Component: engine
 2016-11-18 09:39:34 -08:00
Aaron Lehmann 2efd6e2078 Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
 2016-11-18 09:31:31 -08:00
Brian Goff b58d62c699 Merge pull request #28577 from chchliang/defercode 
function setupOOMScoreAdj file close illogicality
Upstream-commit: 06e92cc2c1e840095f2f11f576fe6097b0fc44af
Component: engine
 2016-11-18 11:48:58 -05:00
Kenfe-Mickael Laventure 5cab628042 Update containerd & runc 
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
 2016-11-18 08:15:20 -08:00
allencloud 7534114314 judge manager before unlocking 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 972a246c671b52786a5e57743babfcf7b5b5ae99
Component: engine
 2016-11-18 23:49:40 +08:00
Daniel Nephin 6a67c61a99 Default parallelism to 1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7c1b39923505adeb13512d6294855b31102963a6
Component: engine
 2016-11-18 16:17:08 +01:00
Alexander Morozov 8b84a1af7f Merge pull request #28586 from felipeweb/fix_infinite_recursion 
fix infinite recursion
Upstream-commit: 8874f80e67c560f44322233bfc22ecd86b85e9e2
Component: engine
 2016-11-18 06:44:52 -08:00
Vincent Demeester 65faee61a6 Add support for healthcheck in composefile v3 
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3bd64de7a9c3eecbd57cb11d861a6fe94a5bb788
Component: engine
 2016-11-18 15:09:13 +01:00
Vincent Demeester 9b29b94a3c Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0903c9db0e1fe0226102e3887b5c30474837e97
Component: engine
 2016-11-18 15:08:29 +01:00
Doug Davis 5dd4a95cae Merge pull request #28578 from allencloud/remove-redudant-file-Close 
remove redundant file Close
Upstream-commit: c41ff780d818e7e663a51c8b3a3a67d7390b417d
Component: engine
 2016-11-18 08:21:58 -05:00
Justin Cormack 9ea16716af Merge pull request #28580 from allencloud/fix-nits-in-error-message 
fix typos
Upstream-commit: b4e69fb3aa6d0def712c5df8dfac8395f86be608
Component: engine
 2016-11-18 13:18:23 +00:00
Brian Goff d9813c8cd8 Merge pull request #28584 from justincormack/devpts-multiple-4.8 
Fix check config script on 4.8 kernels
Upstream-commit: 3e31f3744ea8f915ffb27398abac3efbdadfb8f2
Component: engine
 2016-11-18 08:18:08 -05:00
Felipe Oliveira bc1922b24e fix infinite recursion 
Signed-off-by: Felipe Oliveira <felipeweb.programador@gmail.com>
Upstream-commit: 271b1f27563b18a125b89d2d2629246213dbfd96
Component: engine
 2016-11-18 10:57:50 -02:00
Vincent Demeester c61cce0a3d Merge pull request #28354 from ripcurld00d/tag_creation 
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
 2016-11-18 13:02:40 +01:00
Justin Cormack 6a727694ed Fix check config script on 4.8 kernels 
DEVPTS_MULTIPLE_INSTANCES is no longer an option, it is always set, so
do not check for this post 4.8.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 228ee16df3d738efaf001309370b26561c49edd6
Component: engine
 2016-11-18 11:42:05 +00:00
Vincent Demeester fac3c72b9c Merge pull request #28540 from lixiaobing10051267/masterNewContainerId 
expected new_container_id while testing ContainerCommit
Upstream-commit: c0acfd1dadff10b3151699558232af7b7fc67718
Component: engine
 2016-11-18 12:13:30 +01:00
Vincent Demeester c2c8a860a9 Merge pull request #28565 from crosbymichael/cputime 
Fix cfs period calculation
Upstream-commit: 9e43a68f697832cd895cf8c512d3f7d497b3d0f5
Component: engine
 2016-11-18 12:12:53 +01:00
allencloud 9532520f5c remove redundant file Close 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 3dca62cfb1e7c6404cb4730425919f66c680b409
Component: engine
 2016-11-18 17:50:02 +08:00
chchliang 42dbfa07b6 function setupOOMScoreAdj file close illogicality 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
Upstream-commit: e82fa89bcd7118af9b1a7ef2f15748a9e879813d
Component: engine
 2016-11-18 17:34:01 +08:00
Michael Crosby 8e7b567a6b Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: aff99136b44c0a3d9ef381afd38a5cd05328ddc6
Component: engine
 2016-11-18 00:47:43 -08:00
Boaz Shuster af870551d0 Change the docker-tag usage text to be clearer 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 039aca05c2eae8a06dc16ff97110539feb44d13b
Component: engine
 2016-11-18 10:34:02 +02:00
allencloud 5d1129c013 fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1f039a66ac55c937f5dfa281a04009626d191f83
Component: engine
 2016-11-18 15:51:36 +08:00
Tõnis Tiigi 57cb96469f Merge pull request #28558 from cpuguy83/add_vim 
Add vim to Dockerfile
Upstream-commit: 27699ba8b23217525b0b026fa689834db4454a35
Component: engine
 2016-11-17 21:14:19 -08:00
lixiaobing10051267 bab39b5981 expected new_container_id while testing ContainerCommit 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 773ae28daed55c8d89e753c1cb6b8b7e4102d3b6
Component: engine
 2016-11-18 10:21:04 +08:00
Brian Goff a0ff297783 Add vim to Dockerfile 
Why? Most of the time I end up needing an editor when in `make shell`.
Spent much time doing `apt-get update && apt-get install vim`.
Since we're already installing vim-common anyway...

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7d1a72a2866aedbc7492a0cfc5cd4e13646322fe
Component: engine
 2016-11-17 20:02:26 -05:00
Sebastiaan van Stijn 2b9dc0f4a1 Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference 
Update `images` cli reference with reference filter
Upstream-commit: c6d69ea9e9a913e6036c5e3832083183ce92da23
Component: engine
 2016-11-18 01:34:48 +01:00
Michael Crosby f88393dfba Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
Upstream-commit: 4b29f404b1afe0989426d7a0cc0d2e01a7a3f2b6
Component: engine
 2016-11-17 16:29:21 -08:00
Sebastiaan van Stijn ecfb55a706 Merge pull request #28560 from akshaykarle/master 
fix a typo
Upstream-commit: d9612db9745a6f1f0551536add119d4d2f9808c2
Component: engine
 2016-11-18 01:03:05 +01:00
Andrea Luzzardi 84fb1a0844 router: Return explicit error rather than 404 for experimental. 
Instead of not adding experimental routes at all, fail with an explicit
message if the daemon is not running in experimental mode.

Added the `router.Experimental` which does this automatically.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 3976a33c1a578827da3726bec3927cc058fe326a
Component: engine
 2016-11-17 15:51:47 -08:00
Michael Crosby ba96408498 Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable 
api/server/httputils: service unavailable for disable swarm
Upstream-commit: bbac9eeae68a2d1084961dc3b0adc4e9e729647c
Component: engine
 2016-11-17 15:16:23 -08:00
Michael Crosby 02df9fec1f Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template 
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e61ad7465503a2cfe4c8cfec2f929831c28fd84a
Component: engine
 2016-11-17 15:13:02 -08:00
Victor Vieux 47077e4caf error on cli when trying to use experimental feature with non experimental daemon 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 98bb08fe38d6faabb639b31ea34aac2ea65f519d
Component: engine
 2016-11-17 14:52:01 -08:00
Vincent Demeester 3dbc7d0417 Merge pull request #28557 from vdemeester/fix-tini-compilation-error-on-photon 
Update Tini to fix photon build-rpm compilation errors
Upstream-commit: 870f52533f6678594839a06d872a173f213b9a7c
Component: engine
 2016-11-17 23:40:39 +01:00
Vincent Demeester 88f526a8b0 Merge pull request #28552 from tomwilkie/fix-multi-read-seeker 
Fix use of cap in MultiReadSeeker; possible data corruption bug.
Upstream-commit: 423c014038714cc28926429203580ca882bcd63f
Component: engine
 2016-11-17 23:40:30 +01:00
Tõnis Tiigi 9f30feb096 Merge pull request #28554 from vieux/showhelp 
refactor help func in CLI
Upstream-commit: 43de09045c3aa7e1d2f45533cbd243a6e2d26f5e
Component: engine
 2016-11-17 14:27:26 -08:00
Akshay Karle 0a4f3b6f0e fix a typo 
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com>
Upstream-commit: 2d08a764211035ec93aa3a97afb2baff074103da
Component: engine
 2016-11-17 16:51:37 -05:00
Brian Goff e3739bc965 Merge pull request #28383 from zteBill/fix-useless-var 
Remove needless var
Upstream-commit: 6969c98a3c9ca90616d88c6a57543ccd5724e6fb
Component: engine
 2016-11-17 16:18:07 -05:00
Tom Wilkie 169609485f s/bCap/bLen/ 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Upstream-commit: 3a0554585177a55802377423bb4529d305b4566f
Component: engine
 2016-11-17 21:05:09 +00:00
Vincent Demeester 182a7a908f Update Tini to fix photon build-rpm compilation errors 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ce33d4e1c3d2ca3672a4d7e8e2b553de842fef30
Component: engine
 2016-11-17 22:03:32 +01:00
Evan Hazlett d9512c0fad do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: bebd472e40cae91b548e983872a2665a5836ba43
Component: engine
 2016-11-17 15:49:02 -05:00