Vincent Demeester
725b5b595b
Merge pull request #19801 from albers/completion-journald-opt-tag
...
bash completion for journald tag support
2016-01-28 08:58:41 +01:00
Harald Albers
11fe3edacb
bash completion for journald tag support
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-28 08:41:37 +01:00
Vincent Demeester
7ee1aaf06d
Merge pull request #19769 from HackToday/fixubuntudoc
...
Make install instruction consistent
2016-01-28 08:31:45 +01:00
Vincent Demeester
adb9fa7362
Merge pull request #19401 from wenchma/18410-default_net_driver
...
docs: document options for default network driver
2016-01-28 08:30:30 +01:00
Vincent Demeester
36b5e63179
Merge pull request #19773 from coolljt0725/fix_message
...
Correct the info message when stop container
2016-01-28 08:29:42 +01:00
Kai Qiang Wu(Kennan)
b02552124b
Make install instruction consistent
...
Right now in ubuntu section, instruction is not consistent
for sudo, so it is better to keep it style same.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-28 06:54:59 +00:00
Wen Cheng Ma
ebd1f70165
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-28 11:49:07 +08:00
David Calavera
3dd01713d8
Merge pull request #17849 from daehyeok/remove_empty_file
...
Remove output file when save/export fail
2016-01-27 15:31:29 -08:00
Jess Frazelle
07312af8fa
Merge pull request #19747 from cpuguy83/nogc
...
Turn off GC during `make binary`
2016-01-27 15:02:38 -08:00
Sebastiaan van Stijn
e5b1f29ac3
Merge pull request #19788 from cyli/vendor-notary
...
Include a new version of notary with less verbose INFO+ logging
2016-01-27 14:35:32 -08:00
David Calavera
7a016578db
Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
...
Added flag to ignore fluentd connect error on container start
2016-01-27 14:25:24 -08:00
Sebastiaan van Stijn
c1191eb0e8
Merge pull request #19741 from jfrazelle/better-apparmor-docs
...
way better apparmor docs
2016-01-27 14:22:54 -08:00
Jessica Frazelle
a6701790ee
way better apparmor docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-27 14:08:42 -08:00
David Calavera
0f5aa19593
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
2016-01-27 13:42:56 -08:00
Vincent Demeester
7beccdc609
Merge pull request #19721 from bboreham/doc-ip-failure
...
Improve wording about re-assigning IP addresses
2016-01-27 22:17:06 +01:00
Brian Goff
f4e5eb3f86
Merge pull request #19775 from coolljt0725/fix_prepare_mount
...
daemon: don't prepare mountpoint for restart container
2016-01-27 16:11:12 -05:00
Sebastiaan van Stijn
b9c8fc5ac9
Merge pull request #19748 from tkopczynski/18884-daemon-not-running-faq
...
FAQ: add docker daemon unavailable note
2016-01-27 13:10:41 -08:00
Tomasz Kopczynski
83c1fd6f53
FAQ: add docker daemon unavailable note
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-01-27 21:18:02 +01:00
Brian Goff
9672afa339
Add `DOCKER_BUILD_GOGC` to tweak GOGC for compile
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-27 13:35:26 -05:00
Vincent Demeester
fff1511c56
Merge pull request #19564 from bobrik/journald-tag
...
Add tag support to journald logging driver, closes #19556
2016-01-27 19:21:23 +01:00
cyli
71a1caddf0
Include a new version of notary with less verbose INFO+ logging
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-27 09:46:26 -08:00
Jess Frazelle
c39c7e6edf
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
Jess Frazelle
6b2c1ed4c0
Merge pull request #19784 from vdemeester/oh-tools-it
...
Fix TOOLS.md jenkins plugin link :)
2016-01-27 09:34:29 -08:00
Bryan Boreham
caad94d7bb
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-27 17:11:12 +00:00
Arnaud Porterie
777ee34b07
Factorize sleeping containers
...
Add `runSleepingContainer` and `runSleepingContainerInImage` helper
functions to factor out the way to run system-specific idle containers.
Define a sleeping container as command `top` in image `busybox` for
Unix and as command `sleep 60` in image `busybox` for Windows. Provide a
single point of code to update those.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-27 08:48:08 -08:00
Brian Goff
ae14e6cc0a
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
2016-01-27 11:21:01 -05:00
Vincent Demeester
8544913754
Fix TOOLS.md jenkins plugin link :)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-27 16:33:20 +01:00
Brian Goff
c17d4b4ebb
Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock
...
fix dead lock in volume store dereference
2016-01-27 09:28:11 -05:00
Antonio Murdaca
c1b168664f
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
2016-01-27 14:08:28 +01:00
Ivan Babrou
5a3351883b
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com>
2016-01-27 10:52:19 +00:00
Vincent Demeester
38424b73d9
Merge pull request #19778 from albers/completion-volume-ls-dangling
...
Improve bash completion for `docker volume ls -f dangling`
2016-01-27 09:54:24 +01:00
Pei Su
f5310652d3
fix dead lock in volume store dereference
...
Signed-off-by: Pei Su <sillyousu@gmail.com>
2016-01-27 16:34:10 +08:00
Harald Albers
a381efcf39
Improve bash completion for `docker volume ls -f dangling`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-27 09:32:14 +01:00
Vincent Demeester
805a107df4
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
2016-01-27 09:07:47 +01:00
Lei Jitang
6716a3a167
Correct the info message when stop container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-27 03:06:45 -05:00
Sebastiaan van Stijn
ab8da94531
Merge pull request #19759 from thaJeztah/docs-for-19688
...
Fix docs for tmpfs (pr 19688)
2016-01-27 00:05:38 -08:00
Sebastiaan van Stijn
386392f799
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-26 23:52:14 -08:00
Lei Jitang
0feeab2e43
daemon: don't prepare mountpoint for restart container
...
The restart container has already prepared the mountpoint, there is
no need to do that again. This can speed up the daemon start if
the restart container has a volume and the volume driver is not
available.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-27 02:43:40 -05:00
Sebastiaan van Stijn
857093fbca
Merge pull request #19754 from jfrazelle/revised-release-docs
...
updates to release checklist
2016-01-26 23:32:18 -08:00
Sebastiaan van Stijn
872b927c76
Merge pull request #19753 from jfrazelle/repo-docs
...
add docs for package repo maintenance
2016-01-26 23:30:21 -08:00
Jussi Nummelin
3cf82ff1ab
Added flag to ignore fluentd connect error on container start
...
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
Changed buffer size to 1M and removed unnecessary fmt call
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
Updated docs for the new fluentd opts
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
2016-01-27 09:05:44 +02:00
David Calavera
63f8429bf0
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
2016-01-26 21:55:32 -08:00
Arnaud Porterie
1445e4db32
Enable incremental builds
...
Remove the `-a` build flag and introduce `-i` in order to reuse
previously compiled dependencies.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-26 21:24:44 -08:00
Daehyeok Mun
b78c736356
Remove output file when save/export fail
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-01-26 22:12:31 -07:00
Arnaud Porterie
d789618ea4
Merge pull request #19765 from Microsoft/jjh/ibrokewindowsci
...
Darn it, I broke CI due to multiple declarations
2016-01-26 21:05:34 -08:00
John Howard
3c61f00616
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 20:23:40 -08:00
John Howard
916b9db71d
Windows CI: Darn it, I broke due to multiple declarations
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 19:58:53 -08:00
Lei Jitang
0ae94303b8
Merge pull request #19722 from WeiZhang555/exec-restarting
...
Forbid exec a restarting container
2016-01-27 11:43:43 +08:00
Sebastiaan van Stijn
3cf4884787
Merge pull request #19612 from Microsoft/jjh/apicontainerstest
...
Windows CI: Fixup docker_api_containers_test.go
2016-01-26 19:14:43 -08:00
Arnaud Porterie
603c04a789
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
2016-01-26 19:08:33 -08:00