8bc92ae008
Assert error in body of function inspectField*
...
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 62a856e9129c9d5cf7db9ea6322c9073d68e3ea4
Component: engine
2016-01-29 23:39:07 +08:00
d551cc0b90
bash completion for journald tag support
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 11fe3edacbbba2633bc044ec044377febbd7d759
Component: engine
2016-01-28 08:41:37 +01:00
87883a2e64
Merge pull request #19769 from HackToday/fixubuntudoc
...
Make install instruction consistent
Upstream-commit: 7ee1aaf06d311856f0e8b4b4c21249458e01fc77
Component: engine
2016-01-28 08:31:45 +01:00
45d01482b0
Merge pull request #19401 from wenchma/18410-default_net_driver
...
docs: document options for default network driver
Upstream-commit: adb9fa736283bd0c57edccd44819207c63f8be98
Component: engine
2016-01-28 08:30:30 +01:00
fb0f0495d5
Merge pull request #19773 from coolljt0725/fix_message
...
Correct the info message when stop container
Upstream-commit: 36b5e6317906d949bf5f823a357f4e30d78e6f98
Component: engine
2016-01-28 08:29:42 +01:00
eff09fc3a5
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 >
Upstream-commit: b02552124b5241d4f29d4d69de26e84110cc562c
Component: engine
2016-01-28 06:54:59 +00:00
9cc23f26d7
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
eb91553b41
Merge pull request #17849 from daehyeok/remove_empty_file
...
Remove output file when save/export fail
Upstream-commit: 3dd01713d8d3a84ab603fa865d32bd23ba6684b6
Component: engine
2016-01-27 15:31:29 -08:00
5ca7c24367
Merge pull request #19747 from cpuguy83/nogc
...
Turn off GC during `make binary`
Upstream-commit: 07312af8fa160c1c87558288e1de9d309b1e9c90
Component: engine
2016-01-27 15:02:38 -08:00
bcbfddb2b6
Merge pull request #19788 from cyli/vendor-notary
...
Include a new version of notary with less verbose INFO+ logging
Upstream-commit: e5b1f29ac311d98b9f92b0211be2477d040e49e0
Component: engine
2016-01-27 14:35:32 -08:00
154bed9787
Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
...
Added flag to ignore fluentd connect error on container start
Upstream-commit: 7a016578dbb5c9b8a43b43e1ce96785fa26baf56
Component: engine
2016-01-27 14:25:24 -08:00
c193203fff
Merge pull request #19741 from jfrazelle/better-apparmor-docs
...
way better apparmor docs
Upstream-commit: c1191eb0e83629a6623ee6119ddb7097538f3fc3
Component: engine
2016-01-27 14:22:54 -08:00
dcac710fd9
way better apparmor docs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: a6701790ee585c625c6a39413d2772dc7ecf80fd
Component: engine
2016-01-27 14:08:42 -08:00
430a04619f
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
Upstream-commit: 0f5aa19593dd2258a26adf37e41e00cbbbab8cf1
Component: engine
2016-01-27 13:42:56 -08:00
24f696e76e
Merge pull request #19721 from bboreham/doc-ip-failure
...
Improve wording about re-assigning IP addresses
Upstream-commit: 7beccdc609667e6ec7517494779bbb2ef61102af
Component: engine
2016-01-27 22:17:06 +01:00
7a7dba5630
Merge pull request #19775 from coolljt0725/fix_prepare_mount
...
daemon: don't prepare mountpoint for restart container
Upstream-commit: f4e5eb3f86a6d8681bbf85d5f46d589c242a3578
Component: engine
2016-01-27 16:11:12 -05:00
53da62423e
FAQ: add docker daemon unavailable note
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 83c1fd6f53d1b061fd71057210a6e317fcd56359
Component: engine
2016-01-27 21:18:02 +01:00
259365d60a
Add DOCKER_BUILD_GOGC to tweak GOGC for compile
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
2016-01-27 13:35:26 -05:00
d8e7280e1e
Merge pull request #19564 from bobrik/journald-tag
...
Add tag support to journald logging driver, closes #19556
Upstream-commit: fff1511c56e35cf5230d05af2282d31d23a31dc0
Component: engine
2016-01-27 19:21:23 +01:00
ee8542db2e
Include a new version of notary with less verbose INFO+ logging
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
2016-01-27 09:46:26 -08:00
0da34ddb69
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
2016-01-27 09:36:26 -08:00
0f96a7bb9f
Merge pull request #19784 from vdemeester/oh-tools-it
...
Fix TOOLS.md jenkins plugin link :)
Upstream-commit: 6b2c1ed4c0921834311244d2c23e91f670c22084
Component: engine
2016-01-27 09:34:29 -08:00
5cfcf48d8a
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: caad94d7bb12f07976141b4e7bc04f94f0380961
Component: engine
2016-01-27 17:11:12 +00:00
7f9cdda847
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 >
Upstream-commit: 777ee34b075292e5aee16c4088444508899f8f35
Component: engine
2016-01-27 08:48:08 -08:00
7383a82de4
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
Upstream-commit: ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44
Component: engine
2016-01-27 11:21:01 -05:00
e30b51b22f
Fix TOOLS.md jenkins plugin link :)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 85449137548f98e2af9b06818183b2b60d51d9f0
Component: engine
2016-01-27 16:33:20 +01:00
efdc7448da
Merge pull request #19779 from sillyousu/19777-fix-volume-store-dereference-deadlock
...
fix dead lock in volume store dereference
Upstream-commit: c17d4b4ebb7f15b4fcb32d191ea3306d13f15d06
Component: engine
2016-01-27 09:28:11 -05:00
7835159bd3
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
Upstream-commit: c1b168664f3b0d92164f1a4308ad6c653d38cf40
Component: engine
2016-01-27 14:08:28 +01:00
8977875ac5
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com >
Upstream-commit: 5a3351883b254d3690e9dcc5b89293bcee474493
Component: engine
2016-01-27 10:52:19 +00:00
debd24d25b
fix dead lock in volume store dereference
...
Signed-off-by: Pei Su <sillyousu@gmail.com >
Upstream-commit: f5310652d30e72fe88a3edc70b2911397c28b7e4
Component: engine
2016-01-27 16:34:10 +08:00
42e15b6834
Improve bash completion for docker volume ls -f dangling
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a381efcf39ef7f82b1496a4bbaf42df096d91bc5
Component: engine
2016-01-27 09:32:14 +01:00
46738c170b
Merge pull request #19736 from albers/completion-network-rm-custom
...
Let bash completion for `docker network rm` only complete custom networks
Upstream-commit: 805a107df4c43e5fd20dce7d716001290d7b2840
Component: engine
2016-01-27 09:07:47 +01:00
2336bc4aed
Correct the info message when stop container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 6716a3a167fcd0a9abc013ce536117175922af96
Component: engine
2016-01-27 03:06:45 -05:00
d35ce892f0
Merge pull request #19759 from thaJeztah/docs-for-19688
...
Fix docs for tmpfs (pr 19688)
Upstream-commit: ab8da94531ba77feee1931923be812354fbd2b2c
Component: engine
2016-01-27 00:05:38 -08:00
3bba97b9dd
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 386392f79987a135fd9168cc92482f92c671713c
Component: engine
2016-01-26 23:52:14 -08:00
2fd968f843
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 >
Upstream-commit: 0feeab2e43a75bee3d5709248544b3078df96706
Component: engine
2016-01-27 02:43:40 -05:00
253f58ccf7
Merge pull request #19754 from jfrazelle/revised-release-docs
...
updates to release checklist
Upstream-commit: 857093fbcaf8929e24bc42689c3fe337d2c34dcf
Component: engine
2016-01-26 23:32:18 -08:00
f8277f71b6
Merge pull request #19753 from jfrazelle/repo-docs
...
add docs for package repo maintenance
Upstream-commit: 872b927c765943be7237b4b6c9c2d6e6850045eb
Component: engine
2016-01-26 23:30:21 -08:00
9669dc677a
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 >
Upstream-commit: 3cf82ff1ab14e1ddd2b629524e894ac359168388
Component: engine
2016-01-27 09:05:44 +02:00
ee42d601b2
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
Upstream-commit: 63f8429bf0152bf0e8903ab4def18295bd6d4e1d
Component: engine
2016-01-26 21:55:32 -08:00
50846c5d05
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 >
Upstream-commit: 1445e4db32e648277470513213473021ca59010a
Component: engine
2016-01-26 21:24:44 -08:00
868c4d3b26
Remove output file when save/export fail
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: b78c736356cb2142e66bd8c8020f6f355c565917
Component: engine
2016-01-26 22:12:31 -07:00
380ad90e75
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c61f006162f2781651dda764dddcf4af4957846
Component: engine
2016-01-26 20:23:40 -08:00
2f92225c3a
Windows CI: Darn it, I broke due to multiple declarations
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 916b9db71d6de8db8731a6d881079a7a8e61eb64
Component: engine
2016-01-26 19:58:53 -08:00
4c547f393d
Merge pull request #19722 from WeiZhang555/exec-restarting
...
Forbid exec a restarting container
Upstream-commit: 0ae94303b89a9648f26b599617a9d78ee5284a4c
Component: engine
2016-01-27 11:43:43 +08:00
f913d7db9f
Merge pull request #19612 from Microsoft/jjh/apicontainerstest
...
Windows CI: Fixup docker_api_containers_test.go
Upstream-commit: 3cf4884787b6543dd325cd9f66be7338f2b9997e
Component: engine
2016-01-26 19:14:43 -08:00
d39dd64150
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
Upstream-commit: 603c04a789832652ef141f14bea82f66f974a910
Component: engine
2016-01-26 19:08:33 -08:00
bd0e0077d9
Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
...
Windows CI: Porting for docker_api_images_test.go
Upstream-commit: 864cca2287f7605a2b973e9bad7e4c4330f5662e
Component: engine
2016-01-26 19:04:25 -08:00
7377fa761c
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
Upstream-commit: 70c5e96cb8bd6b826006f73102135bf74e2fa877
Component: engine
2016-01-26 19:03:31 -08:00
e1fbe13aaa
Merge pull request #19603 from Microsoft/jjh/testps
...
Windows CI: Address simple failures in TestPS*
Upstream-commit: 51d4d8eff214ce1ec97d652f00cc70e822e6aba7
Component: engine
2016-01-26 19:01:17 -08:00
Zhang Wei
Harald Albers
Vincent Demeester
Kai Qiang Wu(Kennan)
Wen Cheng Ma
David Calavera
Jess Frazelle
Sebastiaan van Stijn
Jessica Frazelle
Brian Goff
Tomasz Kopczynski
cyli
Bryan Boreham
Arnaud Porterie
Antonio Murdaca
Ivan Babrou
Pei Su
Lei Jitang
Sebastiaan van Stijn
Jussi Nummelin
Daehyeok Mun
John Howard