Commit Graph
29000 Commits
Author SHA1 Message Date
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 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
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 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
Sebastiaan van Stijn 70d8e3de49 Merge pull request #28380 from sdurrheimer/zsh-completion-build-network
Add zsh completion for 'docker image build --network'
Upstream-commit: 35ee642feb0db7cc29605935182d98434b27907e
Component: engine
2016-11-15 00:30:30 +01:00
John Howard a8254f6ffd Gitignore dockerversion\version_autogen_unix.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e2adb5560b6ef666beb69de53028925098a952c9
Component: engine
2016-11-14 15:18:23 -08:00
Anusha Ragunathan 195add3182 Perform graceful shutdown during plugin disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 766cc9b46753106c6880ccdea0a4dcb2bc734c2a
Component: engine
2016-11-14 15:09:48 -08:00
Victor Vieux bfcd54d462 Merge pull request #28340 from cpuguy83/28337_fix_template_opts_ps
Fix issue with missing fields for `ps` template
Upstream-commit: 8930aa0a8615b02905c5f33c00ddef383bdc2193
Component: engine
2016-11-14 14:25:01 -08:00
Victor Vieux b92b18a87d Merge pull request #27985 from muayyad-alsadi/17734-better-message-for-host-volumes
fixes #17734, clear message for host volumes not starting with /
Upstream-commit: b06dc994f683fb774be2cfe70d76feb0f684c70e
Component: engine
2016-11-14 14:21:17 -08:00
Justin Cormack 87e4b91e48 Merge pull request #28410 from cpuguy83/move_streamconfig
Move `StreamConfig` out of `runconfig`
Upstream-commit: 65835bfaa6d44b2255ed25eab74ebcdc8b3ba491
Component: engine
2016-11-14 21:50:52 +00:00
Brian Goff ad9327f119 Move StreamConfig out of runconfig
`StreamConfig` carries with it a dep on libcontainerd, which is used by
other projects, but libcontainerd doesn't compile on all platforms, so
move it to `github.com/docker/docker/container/stream`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ea75bb6bf41aeaeaa15d8bcceea5be87c211ffc
Component: engine
2016-11-14 15:15:09 -05:00
Victor Vieux d964d54555 Merge pull request #28397 from anusha-ragunathan/plugin_push_docs
Add docs for plugin push
Upstream-commit: bf7759cb75205c66ccf318334eb08f7bee593c74
Component: engine
2016-11-14 11:22:49 -08:00
Tibor Vass 80ee24a55b Merge pull request #28341 from johnstep/show-experimental
Show experimental flags and subcommands if enabled
Upstream-commit: 27b673bb8143856d308fac1b2e8e39c80fe914f8
Component: engine
2016-11-14 11:18:09 -08:00
Anusha Ragunathan c932aa3c77 Add docs for plugin push
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d2bb29f87e326034e4329e31f3208d8f610ccef7
Component: engine
2016-11-14 09:10:21 -08:00
Sebastiaan van Stijn 27381440fb Merge pull request #28280 from yuexiao-wang/remove-doc
Remove duplicated document
Upstream-commit: 6cf39760418ab2341e00040d7eecc19542aa9337
Component: engine
2016-11-14 17:34:47 +01:00
Muayyad Alsadi 3b746165af remove "starting with /"
Signed-off-by: Muayyad Alsadi <alsadi@gmail.com>
Upstream-commit: 2d3df91436a096e17214fc56aee4968c3fe598de
Component: engine
2016-11-14 16:51:29 +02:00
Sebastiaan van Stijn 41dd2ecf80 Merge pull request #28378 from sdurrheimer/zsh-completion-service-dns
Add zsh completion for 'docker service' DNS settings
Upstream-commit: a27e51ea9842ec0ac3cfc98bb391b7debd20e706
Component: engine
2016-11-14 15:46:05 +01:00
Sebastiaan van Stijn 3715fc37cc Merge pull request #28386 from sdurrheimer/zsh-completion-service-secret
Add zsh completion for 'docker service {create,update} --secret'
Upstream-commit: b661338d87e219136ce467df49b2a1247a8742d4
Component: engine
2016-11-14 15:23:03 +01:00
Vincent Demeester 1972d4f850 Merge pull request #28365 from wefine/fix-t-errorf
fix t.Errorf to t.Error in serveral _test.go
Upstream-commit: 21051de6e1ba928a08baff505a7d89532b6133eb
Component: engine
2016-11-14 14:46:30 +01:00
Steve Durrheimer ae0437f374 Add zsh completion for 'docker service {create,update} --secret'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0bc07d29577bf163eb88c4047e52382218dd4026
Component: engine
2016-11-14 13:38:48 +01:00
Sebastiaan van Stijn 516defc10d Merge pull request #28344 from albers/completion-service--ports
Add bash completion for managing ports in services
Upstream-commit: e129365fd371eba3fcf3d8e64bb1a12a297d0323
Component: engine
2016-11-14 12:40:36 +01:00
Sebastiaan van Stijn 12f5dc9d03 Merge pull request #28381 from sdurrheimer/zsh-completion-secret-command
Add zsh completion for the new 'docker secret' command
Upstream-commit: 7ee0c3c9f81cd87e61ecf199eeca0b60bda0c3aa
Component: engine
2016-11-14 12:14:25 +01:00
wefine 7a9630020f fix t.Errorf to t.Error in serveral _test.go
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
2016-11-14 17:54:43 +08:00
Vincent Demeester 3e5a34af4b Merge pull request #28203 from shaynewang/27687-fix-tail-flag-returning-more-lines
Fixes #27687 docker logs --tails returns less lines than expected
Upstream-commit: 28094357ed3f7238e533b870a4e24676c6102f2e
Component: engine
2016-11-14 10:17:38 +01:00
Steve Durrheimer afb911f1fd Add zsh completion for 'docker service' DNS settings
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 54ebf4f74a5e8f6598849da4a9052743ada8e83f
Component: engine
2016-11-14 09:45:27 +01:00
Akihiro Suda 2169a7a10e Merge pull request #28369 from yongtang/11132016-completion-dns-option
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
Upstream-commit: e7769e29e00394ccac3d1eabb0efff92864c30da
Component: engine
2016-11-14 16:39:28 +09:00
Steve Durrheimer f7b1bf984c Add zsh completion for the new 'docker secret' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b184bdabf7a01c4b802304ac64ac133743c484be
Component: engine
2016-11-14 08:24:19 +01:00
Steve Durrheimer 534b21da59 Add zsh completion for 'docker image build --network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11bfa638fe5b5fecf16341d4d7154c233862d946
Component: engine
2016-11-14 08:22:09 +01:00
yuexiao-wang f67a1e9e2b Remove duplicated document
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5527202e41dfa48b8635dd6f274acb7f19ee3302
Component: engine
2016-11-14 14:43:00 +08:00
Lei Jitang 178e6d0499 Merge pull request #28370 from yongtang/11132016-docs-typo
Fix a small typo in `docs/deprecated.md`
Upstream-commit: 2b5f1050cc2b4ebfdb0c50c73a958a45c62a899c
Component: engine
2016-11-14 13:34:03 +08:00
Shayne Wang c22557cc46 Change reading order of tailfile
change reading order from beginning at the end to beginning at a buffer start
added intergration tests for boundary cases
Removed whitespace
Signed-off-by: Shayne Wang <shaynexwang@gmail.com>
Upstream-commit: 63904eb6745d553573ffe8b7cef43dfc0b8a07cf
Component: engine
2016-11-13 20:08:51 -08:00
Yong Tang 527e874e41 Fix a small typo in docs/deprecated.md
A small typo in `docs/deprecated.md`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 45e5b2552ab1ca685e88e0feeedc92fb817d8567
Component: engine
2016-11-13 20:04:25 -08:00
Yong Tang 8a0323e12b Update bash completion dns-options-add/rm -> dns-option-add/rm
In 28186, `dns-options-add/rm` has been changed to `dns-option-add/rm`
in `docker service create/update`, for the purpose of consistency.

This fix updates bash completion to remove extra `s`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: fb8404a3488bccfb4b318d279332946f370d1452
Component: engine
2016-11-13 19:12:01 -08:00
Brian Goff 42ecb20b60 Merge pull request #28367 from miaoyq/fix-a-comment-err
Fix a comment error
Upstream-commit: d8a7b13cd60499c72ad4d506fd7b6943b225e915
Component: engine
2016-11-13 21:12:59 -05:00
Yanqiang Miao 9e9974619f Fix a comment error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 19e2c9177a111758e304ad9dbd0835cddbd840ab
Component: engine
2016-11-14 09:55:27 +08:00
Vincent Demeester a107ce5f56 Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
Akihiro Suda e8319d6f50 Merge pull request #28362 from albers/completion-service-dns
Add bash completion for DNS settings in services
Upstream-commit: f39cb08209ceffcb3363ab1f46007f11cb287211
Component: engine
2016-11-14 05:42:24 +09:00
Vincent Demeester 829db7abcd Merge pull request #28360 from albers/completion-service-ps--all
Add bash completion for `docker service ps --all`
Upstream-commit: e649cc147630746b1e98424933ee457d3f0c7f46
Component: engine
2016-11-13 21:39:07 +01:00
Vincent Demeester 560a7b97d2 Merge pull request #28357 from sdurrheimer/zsh-completion-service-ports
Add zsh completion for 'docker service {create --port, update --port-…
Upstream-commit: f1dd4c5ad8fbbe8cb977389d042879a6960f9605
Component: engine
2016-11-13 21:38:17 +01:00
Vincent Demeester 22c20a57de Merge pull request #28355 from sdurrheimer/zsh-completion-build-cache-from
Add zsh completion for 'docker image build --cache-from'
Upstream-commit: bf2c875cd60df4e7f2fcf28bd56b54dfd67e878e
Component: engine
2016-11-13 21:37:10 +01:00
Vincent Demeester dfc6729ba9 Merge pull request #28342 from albers/completion-build--cache-from
Add bash completion for `docker build --cache-from`
Upstream-commit: 7220888b0988d4ddfc5fea783420e2dd4b26ff00
Component: engine
2016-11-13 21:34:55 +01:00
Vincent Demeester e7777cd3a6 Merge pull request #28310 from mlaventure/docker-info-update
Docker info binaries version update
Upstream-commit: 1e673b9876ab4a12e7718424db9484fca6f516b3
Component: engine
2016-11-13 21:24:51 +01:00
Harald Albers d74191c744 Add bash completion for DNS settings in services
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28dc8c863a810a5fce078319fb422caced67b725
Component: engine
2016-11-13 11:17:18 -08:00
Harald Albers 6be217cc5f Add bash completion for docker service ps --all
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 188d2fac57d63888f08531adc46aa3349e3b4f3a
Component: engine
2016-11-13 09:32:53 -08:00
Doug Davis 0e5766bf8a Merge pull request #28359 from allencloud/fix-typo-in-node-update-docs
fix typo in node update docs
Upstream-commit: 3be885cd892ef5dc80318953244695f8f7df78a9
Component: engine
2016-11-13 10:41:09 -06:00
allencloud a1ee221aad fix typo in node update docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7bbbc8c7f16869dbb43e4e218ac280d5d1c0944a
Component: engine
2016-11-14 00:07:52 +08:00