Commit graph

29039 commits

Author SHA1 Message Date
Tonis Tiigi
5b0a52f7dc 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>
2016-11-16 13:19:45 -08:00
Victor Vieux
77fca662dd Merge pull request #28485 from Microsoft/jjh/remove-make.sh-old-hack
Remove old Windows hack in make.sh
2016-11-16 11:38:19 -08:00
Michael Crosby
1c29c3a54d Merge pull request #28420 from vieux/update_tini
update tini to a87614212b3a51a9cad57ff7989103a841546745
2016-11-16 09:46:11 -08:00
John Howard
5e6f8cb4a7 Remove old Windows hack in make.sh
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-16 09:29:38 -08:00
Vincent Demeester
673c5ee559 Merge pull request #27631 from allencloud/get-node-brefore-update
allow node update API to receive node name and id prefix
2016-11-16 17:47:31 +01:00
Doug Davis
4dff538118 Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement
Remove redundant 'if' statement
2016-11-16 11:34:40 -05:00
Vincent Demeester
9057294e4c Merge pull request #28475 from vdemeester/update-stats-reference
Update stats cli reference documentation
2016-11-16 17:25:52 +01:00
Vincent Demeester
947464e2f1
Update stats cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-16 15:26:29 +01:00
Justin Cormack
4549e9104c Merge pull request #28440 from cpuguy83/20740_fix_tmpfs_parsing_on_client
Don't validate platform-dep tmpfs opts on client
2016-11-16 12:04:14 +00:00
Sebastiaan van Stijn
297f2fd445 Merge pull request #28346 from yongtang/11122016-docs-api-version
Fix missing versions in example requests of api docs
2016-11-16 12:15:05 +01:00
Vincent Demeester
cd2d52b5f6 Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
Update docs for `docker info` for most recent changes.
2016-11-16 12:08:35 +01:00
Vincent Demeester
d60cb82ca5 Merge pull request #28471 from lixiaobing10051267/masterLogGroupName
function TestCreateSuccess uses a wrong variable LogGroupName
2016-11-16 12:06:15 +01:00
Vincent Demeester
cec2dffd50 Merge pull request #28468 from sdurrheimer/zsh-completion-system-df
Add zsh completion for 'docker system df'
2016-11-16 12:05:49 +01:00
Yanqiang Miao
d63dc45f0b 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>
2016-11-16 16:50:54 +08:00
lixiaobing10051267
320c93824b function TestCreateSuccess uses a wrong variable LogGroupName
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-16 16:48:36 +08:00
Steve Durrheimer
70fdbff5f0
Add zsh completion for 'docker system df'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-16 08:39:21 +01:00
Tõnis Tiigi
6697fa8a68 Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
Using distribution reference pkg (pin image by digest)
2016-11-15 20:05:26 -08:00
allencloud
d075b83dd6 allow node update api receive node name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 10:18:19 +08:00
Victor Vieux
ff2de8dace Merge pull request #28444 from allencloud/move-getNetwork-func-into-helper-gofile
move func getNetwork into helper.go to keep consistent
2016-11-15 17:03:23 -08:00
Sebastiaan van Stijn
b35973ffe8 Merge pull request #28272 from Microsoft/jjh/sequentialscan2
Windows: Perf: Use sequential file access
2016-11-16 00:47:19 +01:00
Nishant Totla
dc1b6341b9
Refactoring code for pinning image by digest
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-15 13:54:47 -08:00
Sebastiaan van Stijn
5f577bfa6b Merge pull request #28453 from thaJeztah/revert-docs-for-ambient-capabilities
Revert reference docs for ambient capabilities
2016-11-15 22:31:06 +01:00
Sebastiaan van Stijn
d341bb1b6e
Revert reference docs for ambient capabilities
This feature was reverted for docker 1.13
in c5251f7116,
so removing the documentation as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-15 21:59:21 +01:00
Alexander Morozov
27c20a7ea0 Merge pull request #28436 from vdemeester/incremental-build-by-default
Build docker incrementally by default
2016-11-15 09:55:43 -08:00
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
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