Commit graph

29067 commits

Author SHA1 Message Date
allencloud
729b49e9c5 move func getNetwork into helper.go to keep consistent
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 00:28:56 +08:00
Brian Goff
b9b8d8b364 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>
2016-11-15 11:01:40 -05:00
Vincent Demeester
2c342cff79
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>
2016-11-15 16:23:48 +01:00
Vincent Demeester
03f79a2115 Merge pull request #28435 from jonboulle/master
man/docker: wrap lines consistently
2016-11-15 15:47:05 +01:00
Sebastiaan van Stijn
95c898d1f9 Merge pull request #28422 from yuexiao-wang/update-driver
Modify serial number and fix some typos
2016-11-15 15:04:32 +01:00
Jonathan Boulle
ba408fbc9a 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>
2016-11-15 22:46:25 +09:00
Vincent Demeester
101676a591 Merge pull request #28419 from yuexiao-wang/remove-stack-tasks
Remove inexistent link and add related links
2016-11-15 13:51:46 +01:00
Sebastiaan van Stijn
c716827dc8 Merge pull request #26868 from Microsoft/jjh/deprecateemail
1.14 deprecation: email from login
2016-11-15 13:08:05 +01:00
Vincent Demeester
b6e1f11105 Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win
Updated daemon documentation to clarify that live-restore is not supp…
2016-11-15 11:06:26 +01:00
Vincent Demeester
832833db48 Merge pull request #28424 from jonboulle/master
man page: consistent indents for flag descriptions
2016-11-15 10:45:42 +01:00
yuexiao-wang
9ddd1242db Modify serial number and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-15 17:15:26 +08:00
bbayani
45bccaeacb Updated daemon documentation to clarify that live-restore is not suppoted on windows
Review comment implementation

Signed-off-by: bbayani <bhumikabayani@gmail.com>
2016-11-15 07:07:43 +00:00
Jonathan Boulle
8eeaa25563 man page: consistent indents for flag descriptions
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
2016-11-15 14:59:47 +09:00
Victor Vieux
b1a91dcc0f update tini to a87614212b3a51a9cad57ff7989103a841546745
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-14 17:47:04 -08:00
John Howard
7c29f5beed Windows: Use sequential file access
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-14 17:41:52 -08:00
yuexiao-wang
985cc9fb05 Remove inexistent link and add related links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-15 09:40:44 +08:00
Victor Vieux
da32371922 Merge pull request #28417 from Microsoft/jjh/autogen
Gitignore dockerversion\version_autogen_unix.go
2016-11-14 17:32:15 -08:00
Brian Goff
eb3a489246 Merge pull request #28418 from anusha-ragunathan/disable_with_grace
Perform graceful shutdown during plugin disable.
2016-11-14 20:27:11 -05:00
Sebastiaan van Stijn
ccba7911c8 Merge pull request #28292 from lixiaobing10051267/masterDockerSwarm
fix the wrong title with docker swarm
2016-11-15 00:37:07 +01:00
Nishant Totla
d910781c66
Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-14 15:31:25 -08:00
Sebastiaan van Stijn
35ee642feb Merge pull request #28380 from sdurrheimer/zsh-completion-build-network
Add zsh completion for 'docker image build --network'
2016-11-15 00:30:30 +01:00
John Howard
e2adb5560b Gitignore dockerversion\version_autogen_unix.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-14 15:18:23 -08:00
Anusha Ragunathan
766cc9b467 Perform graceful shutdown during plugin disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-14 15:09:48 -08:00
Victor Vieux
8930aa0a86 Merge pull request #28340 from cpuguy83/28337_fix_template_opts_ps
Fix issue with missing fields for `ps` template
2016-11-14 14:25:01 -08:00
John Howard
9182cf1a8d Bump API to v1.26
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-14 14:24:02 -08:00
Victor Vieux
b06dc994f6 Merge pull request #27985 from muayyad-alsadi/17734-better-message-for-host-volumes
fixes #17734, clear message for host volumes not starting with /
2016-11-14 14:21:17 -08:00
Justin Cormack
65835bfaa6 Merge pull request #28410 from cpuguy83/move_streamconfig
Move `StreamConfig` out of `runconfig`
2016-11-14 21:50:52 +00:00
Brian Goff
5ea75bb6bf 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>
2016-11-14 15:15:09 -05:00
Victor Vieux
bf7759cb75 Merge pull request #28397 from anusha-ragunathan/plugin_push_docs
Add docs for plugin push
2016-11-14 11:22:49 -08:00
Tibor Vass
27b673bb81 Merge pull request #28341 from johnstep/show-experimental
Show experimental flags and subcommands if enabled
2016-11-14 11:18:09 -08:00
Anusha Ragunathan
d2bb29f87e Add docs for plugin push
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-14 09:10:21 -08:00
Sebastiaan van Stijn
6cf3976041 Merge pull request #28280 from yuexiao-wang/remove-doc
Remove duplicated document
2016-11-14 17:34:47 +01:00
Muayyad Alsadi
2d3df91436 remove "starting with /"
Signed-off-by: Muayyad Alsadi <alsadi@gmail.com>
2016-11-14 16:51:29 +02:00
Sebastiaan van Stijn
a27e51ea98 Merge pull request #28378 from sdurrheimer/zsh-completion-service-dns
Add zsh completion for 'docker service' DNS settings
2016-11-14 15:46:05 +01:00
Sebastiaan van Stijn
b661338d87 Merge pull request #28386 from sdurrheimer/zsh-completion-service-secret
Add zsh completion for 'docker service {create,update} --secret'
2016-11-14 15:23:03 +01:00
Vincent Demeester
21051de6e1 Merge pull request #28365 from wefine/fix-t-errorf
fix t.Errorf to t.Error in serveral _test.go
2016-11-14 14:46:30 +01:00
Steve Durrheimer
0bc07d2957
Add zsh completion for 'docker service {create,update} --secret'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-14 13:38:48 +01:00
Sebastiaan van Stijn
e129365fd3 Merge pull request #28344 from albers/completion-service--ports
Add bash completion for managing ports in services
2016-11-14 12:40:36 +01:00
Sebastiaan van Stijn
7ee0c3c9f8 Merge pull request #28381 from sdurrheimer/zsh-completion-secret-command
Add zsh completion for the new 'docker secret' command
2016-11-14 12:14:25 +01:00
wefine
f78f7de96a fix t.Errorf to t.Error in serveral _test.go
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
2016-11-14 17:54:43 +08:00
Vincent Demeester
28094357ed Merge pull request #28203 from shaynewang/27687-fix-tail-flag-returning-more-lines
Fixes #27687 docker logs --tails returns less lines than expected
2016-11-14 10:17:38 +01:00
Steve Durrheimer
54ebf4f74a
Add zsh completion for 'docker service' DNS settings
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-14 09:45:27 +01:00
Akihiro Suda
e7769e29e0 Merge pull request #28369 from yongtang/11132016-completion-dns-option
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
2016-11-14 16:39:28 +09:00
Steve Durrheimer
b184bdabf7
Add zsh completion for the new 'docker secret' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-14 08:24:19 +01:00
Steve Durrheimer
11bfa638fe
Add zsh completion for 'docker image build --network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-14 08:22:09 +01:00
yuexiao-wang
5527202e41 Remove duplicated document
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-14 14:43:00 +08:00
Lei Jitang
2b5f1050cc Merge pull request #28370 from yongtang/11132016-docs-typo
Fix a small typo in `docs/deprecated.md`
2016-11-14 13:34:03 +08:00
Shayne Wang
63904eb674 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>
2016-11-13 20:08:51 -08:00
Yong Tang
45e5b2552a 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>
2016-11-13 20:04:25 -08:00
Yong Tang
fb8404a348 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>
2016-11-13 19:12:01 -08:00