toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,201 Commits 3 Branches 295 Tags
abd795e58244c331d176c19707a01e466d36e273
Commit Graph
29201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yong Tang 6c1518dd39 Use map[string]bool for preProcessor to ignore unknwon field 
This fix is an attempt to address the issue raised in 28339. In
`docker ps`, the formatter needs to expose all fields of `types.Container`
to `preProcessor` so that template could be executed.

This direct exposing is unreliable and could cause issues as user may incorrectly
assume all fields in `types.Container` will be available for templating.

However, the purpose of `preProcessor` is to only find out if `.Size`
is defined (so that opts.size could be set accordingly).

This fix defines `preProcessor` as `map[string]bool` with a func `Size()`.
In this way, any unknown fields will be ignored.

This fix adds several test cases to the existing `TestBuildContainerListOptions`.

This fix fixes 28339.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 312cc7eebd326cc500e5742115d1e92e94ff60ee
Component: engine
 2016-11-16 13:23:47 -08:00
Tonis Tiigi 43c58c892c Skip cli initialization for daemon command 
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5b0a52f7dcd04017a1def7326f8adbb8547ebe89
Component: engine
 2016-11-16 13:19:45 -08:00
Victor Vieux 73004a6b58 Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack 
Remove old Windows hack in make.sh
Upstream-commit: 77fca662dd71da6be7fd4bb3b40f7074b355607e
Component: engine
 2016-11-16 11:38:19 -08:00
Riyaz Faizullabhoy 397de7b28c Edits to plugin docs after building authz plugin 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: a524c135dce6ce39ccbca68fdd38f5b575ad82f4
Component: engine
 2016-11-16 09:53:23 -08:00
Michael Crosby d37cd17630 Merge pull request #28420 from vieux/update_tini 
update tini to a87614212b3a51a9cad57ff7989103a841546745
Upstream-commit: 1c29c3a54d7194148d569ef2cbac53dbc12a5165
Component: engine
 2016-11-16 09:46:11 -08:00
John Howard a498054fff Remove old Windows hack in make.sh 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5e6f8cb4a7f8bf294b3b459d2c2afed6d69fcdf1
Component: engine
 2016-11-16 09:29:38 -08:00
Vincent Demeester 7acf8456de Merge pull request #27631 from allencloud/get-node-brefore-update 
allow node update API to receive node name and id prefix
Upstream-commit: 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Component: engine
 2016-11-16 17:47:31 +01:00
Doug Davis 107032adcb Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement 
Remove redundant 'if' statement
Upstream-commit: 4dff5381180d25c9037175c3344902008e15e00c
Component: engine
 2016-11-16 11:34:40 -05:00
Vincent Demeester fe596a946e Merge pull request #28475 from vdemeester/update-stats-reference 
Update stats cli reference documentation
Upstream-commit: 9057294e4c9519b096808f30128aeecc43eb4d92
Component: engine
 2016-11-16 17:25:52 +01:00
Vincent Demeester a086b9b802 Update stats cli reference documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 947464e2f1a8df9addce4911f4c1264b2c606543
Component: engine
 2016-11-16 15:26:29 +01:00
Justin Cormack c3410356d7 Merge pull request #28440 from cpuguy83/20740_fix_tmpfs_parsing_on_client 
Don't validate platform-dep tmpfs opts on client
Upstream-commit: 4549e9104cef53ff51a194bc47896a041bf18418
Component: engine
 2016-11-16 12:04:14 +00:00
Sebastiaan van Stijn 6e80fcc7bb Merge pull request #28346 from yongtang/11122016-docs-api-version 
Fix missing versions in example requests of api docs
Upstream-commit: 297f2fd445a751813780a82a254b9aafc6ab6498
Component: engine
 2016-11-16 12:15:05 +01:00
Vincent Demeester a76e66dfce Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs 
Update docs for `docker info` for most recent changes.
Upstream-commit: cd2d52b5f6746ab83b835390fc6eb1f13dabde48
Component: engine
 2016-11-16 12:08:35 +01:00
Vincent Demeester ded6480e13 Merge pull request #28471 from lixiaobing10051267/masterLogGroupName 
function TestCreateSuccess uses a wrong variable LogGroupName
Upstream-commit: d60cb82ca527382d9ea5eba3f8fea8889ea645cf
Component: engine
 2016-11-16 12:06:15 +01:00
Vincent Demeester 7f3314d04b Merge pull request #28468 from sdurrheimer/zsh-completion-system-df 
Add zsh completion for 'docker system df'
Upstream-commit: cec2dffd50ab53e662b41e63615d29f90d728377
Component: engine
 2016-11-16 12:05:49 +01:00
Yanqiang Miao ba567e9b07 Remove redundant 'if' statement 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: d63dc45f0b34be6e25592ea6322a462497a89507
Component: engine
 2016-11-16 16:50:54 +08:00
lixiaobing10051267 166b57151d function TestCreateSuccess uses a wrong variable LogGroupName 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 320c93824b7c4dca3086258264ab142fe4530165
Component: engine
 2016-11-16 16:48:36 +08:00
Steve Durrheimer 2b59e6eef5 Add zsh completion for 'docker system df' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 70fdbff5f077e01897b8d284d1e29de64f8041eb
Component: engine
 2016-11-16 08:39:21 +01:00
Yanqiang Miao 8a3f10150d The type of 'ExportdPorts' should be 'nat.PortSet' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: c44c542d95e62fa5e96c1542f2b8bb878a7976e8
Component: engine
 2016-11-16 13:36:11 +08:00
Tonis Tiigi 7c64e36522 Fix deadlock on cancelling healthcheck 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 89b123473774248fc3a0356dd3ce5b116cc69b29
Component: engine
 2016-11-15 20:10:16 -08:00
Tõnis Tiigi d6be8a084e Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg 
Using distribution reference pkg (pin image by digest)
Upstream-commit: 6697fa8a68db41162063df90f54f8b039d4ca4a1
Component: engine
 2016-11-15 20:05:26 -08:00
allencloud 0d115ba911 allow node update api receive node name and id prefix 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d075b83dd6e5bbd4470400d44889ca71cf9dbd59
Component: engine
 2016-11-16 10:18:19 +08:00
Yong Tang 24edf94c3b Fix error messages for --cpus from daemon 
This fix fixes error messages for `--cpus` from daemon.

When `docker run` takes `--cpus`, it will translate into NanoCPUs
and pass the value to daemon. The `NanoCPU` is not visible to the user.
The error message generated from daemon used 'NanoCPU' which may cause
some confusion to the user.

This fix fixes this issue by returning the error in CPUs instead.

This fix fixes 28456.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d22ac2f3a0de8e2ff6da8f1787e3ac3ac7438f17
Component: engine
 2016-11-15 17:16:09 -08:00
Victor Vieux 09955b008f Merge pull request #28444 from allencloud/move-getNetwork-func-into-helper-gofile 
move func getNetwork into helper.go to keep consistent
Upstream-commit: ff2de8dace1ba1c1f5e8542790ef5cd564375934
Component: engine
 2016-11-15 17:03:23 -08:00
Victor Vieux 9f2af5ec1b explicitly show plugins as unsupported on !linux 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a8139460ff98b081c06ecf28a821d6f456d9a079
Component: engine
 2016-11-15 16:47:30 -08:00
Sebastiaan van Stijn 24e9b9afb4 Merge pull request #28272 from Microsoft/jjh/sequentialscan2 
Windows: Perf: Use sequential file access
Upstream-commit: b35973ffe88771c0a2eac25e29a8b6a3d37a0cbc
Component: engine
 2016-11-16 00:47:19 +01:00
Nishant Totla f5355b9dd8 Refactoring code for pinning image by digest 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: dc1b6341b98c3d009342a878119f683bfe14b471
Component: engine
 2016-11-15 13:54:47 -08:00
Sebastiaan van Stijn 1c5a941976 Merge pull request #28453 from thaJeztah/revert-docs-for-ambient-capabilities 
Revert reference docs for ambient capabilities
Upstream-commit: 5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f
Component: engine
 2016-11-15 22:31:06 +01:00
Sebastiaan van Stijn 1da378e381 Revert reference docs for ambient capabilities 
This feature was reverted for docker 1.13
in c5251f7116e3d9095a7169fc31bd170dff997c2e,
so removing the documentation as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d341bb1b6eac3f40eb4cd5798784635e0183809b
Component: engine
 2016-11-15 21:59:21 +01:00
Alexander Morozov 64d3de7ac0 Merge pull request #28436 from vdemeester/incremental-build-by-default 
Build docker incrementally by default
Upstream-commit: 27c20a7ea0c61976241e0b5e54e0624cf2f1bffd
Component: engine
 2016-11-15 09:55:43 -08:00
Vincent Demeester ca2d19d2b7 Use Container.Config.Shell instead of hardcoded… 
… for healthcheck. It make the code a little cleaner and more
future/usage proof.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5f81cf11f648835bd0182d297d265a4da6c469dd
Component: engine
 2016-11-15 17:53:24 +01:00
allencloud 68648e07db move func getNetwork into helper.go to keep consistent 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 729b49e9c546c035788e60ea137b0958d10aadde
Component: engine
 2016-11-16 00:28:56 +08:00
Brian Goff 60d7f3af29 Don't validate platform-dep tmpfs opts on client 
Daemon still does validation and errors out on incorrect options.

Fixes an issue where non-Linux clients attempting to pass tmpfs options
on `docker run` to a Linux daemon will incorrectly error out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b9b8d8b364a14b6f827c9db94f651dda372ed253
Component: engine
 2016-11-15 11:01:40 -05:00
Vincent Demeester fadee20b95 Build docker incrementally by default 
This speeds up docker build time drastically. It still possible to
disable this by setting `DOCKER_INCREMENTAL_BUILD` to `0` (and this is
what should be done on the CI).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c342cff79d6e781e06258cefcd2b2b1a23396ec
Component: engine
 2016-11-15 16:23:48 +01:00
Vincent Demeester 30a799b2f0 Merge pull request #28435 from jonboulle/master 
man/docker: wrap lines consistently
Upstream-commit: 03f79a211514e26be8920afd3b611b64e5810375
Component: engine
 2016-11-15 15:47:05 +01:00
Sebastiaan van Stijn 051e7426f6 Merge pull request #28422 from yuexiao-wang/update-driver 
Modify serial number and fix some typos
Upstream-commit: 95c898d1f99ae0f84a5fce83b57728143a0db064
Component: engine
 2016-11-15 15:04:32 +01:00
Jonathan Boulle e162db2213 man/docker: wrap lines consistently 
Quite a few changes, as it seems like previous wrapping was done
manually, so it's all over the place.

As noted in #28424

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: ba408fbc9a3131d03bb5389e73cb9eec49e071be
Component: engine
 2016-11-15 22:46:25 +09:00
Vincent Demeester ba476fa907 Merge pull request #28419 from yuexiao-wang/remove-stack-tasks 
Remove inexistent link and add related links
Upstream-commit: 101676a591793755e43d21c1ab061f1fd4c37551
Component: engine
 2016-11-15 13:51:46 +01:00
Sebastiaan van Stijn f1966cf855 Merge pull request #26868 from Microsoft/jjh/deprecateemail 
1.14 deprecation: email from login
Upstream-commit: c716827dc8de961ad2e69b2db2cb32a3749282da
Component: engine
 2016-11-15 13:08:05 +01:00
Vincent Demeester cfe86197f0 Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win 
Updated daemon documentation to clarify that live-restore is not supp…
Upstream-commit: b6e1f11105e21ed30c5d6a47c31ca348a8282937
Component: engine
 2016-11-15 11:06:26 +01:00
Vincent Demeester 7d7de1cea4 Merge pull request #28424 from jonboulle/master 
man page: consistent indents for flag descriptions
Upstream-commit: 832833db4856fd1a7e1933b8e76a726783ef261b
Component: engine
 2016-11-15 10:45:42 +01:00
yuexiao-wang afebcb8b49 Modify serial number and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9ddd1242dbaeaa990c060b7b88ed859fa3b2d981
Component: engine
 2016-11-15 17:15:26 +08:00
bbayani 3a03fb540c Updated daemon documentation to clarify that live-restore is not suppoted on windows 
Review comment implementation

Signed-off-by: bbayani <bhumikabayani@gmail.com>
Upstream-commit: 45bccaeacbc80f28861bd7fe9cb73007b493b11f
Component: engine
 2016-11-15 07:07:43 +00:00
Jonathan Boulle 59bf8f29e4 man page: consistent indents for flag descriptions 
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: 8eeaa2556399f90ad637f74401a6f11c01b7544c
Component: engine
 2016-11-15 14:59:47 +09:00
Victor Vieux 94bcd2ce8a update tini to a87614212b3a51a9cad57ff7989103a841546745 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b1a91dcc0f0ba0bbad1d70943b423464b500657f
Component: engine
 2016-11-14 17:47:04 -08:00
John Howard 593e5eb2d5 Windows: Use sequential file access 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7c29f5beed19b55ac8f14880752d4825ba23eccf
Component: engine
 2016-11-14 17:41:52 -08:00
yuexiao-wang 775645f6c4 Remove inexistent link and add related links 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 985cc9fb053e82967a4469cd5f278271b914480c
Component: engine
 2016-11-15 09:40:44 +08:00
Victor Vieux f960448660 Merge pull request #28417 from Microsoft/jjh/autogen 
Gitignore dockerversion\version_autogen_unix.go
Upstream-commit: da32371922dc5b68cf81a28534e1889a2748ecd7
Component: engine
 2016-11-14 17:32:15 -08:00
Brian Goff 6a99bf05f6 Merge pull request #28418 from anusha-ragunathan/disable_with_grace 
Perform graceful shutdown during plugin disable.
Upstream-commit: eb3a4892467c0dfdd357b1cc37f7ca3623e15119
Component: engine
 2016-11-14 20:27:11 -05:00
Sebastiaan van Stijn fb65149136 Merge pull request #28292 from lixiaobing10051267/masterDockerSwarm 
fix the wrong title with docker swarm
Upstream-commit: ccba7911c80583c1a45ea329a8d337dcd4f6f70e
Component: engine
 2016-11-15 00:37:07 +01:00