dff7942f86
Merge pull request #13190 from unclejack/precompile_regexp
...
Precompile regexp
Upstream-commit: 877461bc2031e104b1f537d08436e36d4c41b9a5
Component: engine
2015-05-13 13:00:14 -07:00
b9cea2b317
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
Upstream-commit: 3da0013ac4c12cacc36dfb8746ed6403e358256f
Component: engine
2015-05-13 12:03:22 -07:00
2f381e17ae
Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase
...
Fix mangled hack/vendor.sh rebase
Upstream-commit: c46c8f4e4082552dd9ea003aaf71fbf52ba983a1
Component: engine
2015-05-13 12:02:07 -07:00
1d7b0aaa0c
Fix mangled hack/vendor.sh rebase
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: c2d618781183817e74245325add5bddebcb810d2
Component: engine
2015-05-13 12:52:59 -06:00
5de033afb0
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: cb08c1173fae541742af3c8329e00904edef48df
Component: engine
2015-05-13 21:48:48 +03:00
3fb26e927f
image: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 8f57e7d2ef82d39e2c914b799e98ed6243b9b1d0
Component: engine
2015-05-13 21:47:43 +03:00
c6760c3f88
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
Upstream-commit: 1b678f86b37e836e6f6cf1f58f18fde36672bfce
Component: engine
2015-05-13 11:35:17 -07:00
28e112fb4d
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
Upstream-commit: ebe9a854869d1b5470e67e3657a62432e36680a3
Component: engine
2015-05-13 11:33:14 -07:00
076e804d9c
Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
...
daemon: Logging drivers architectural refactoring
Upstream-commit: 951c2ef2c94b10ed49f18ca38353c6507c5231fa
Component: engine
2015-05-13 11:00:50 -07:00
a7920a7e08
Merge pull request #13180 from unclejack/fix_test_name
...
integcli: change Dettach to Detach
Upstream-commit: 8eac7d0779626d3bc1f2907a4497720616f41717
Component: engine
2015-05-13 09:07:18 -04:00
0ea0631fe7
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a36f6a140bb7987c18a8177115cbc315672f9e53
Component: engine
2015-05-13 14:24:54 +02:00
5be78509f7
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: fdec5197f145a1aa18329337746f6a94389da0a1
Component: engine
2015-05-13 12:49:19 +03:00
9babc5a64f
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e00cfbb6f2b953301bfcd7270e9bdfde1a2d17c7
Component: engine
2015-05-13 14:28:52 +08:00
5bef2d9b74
Merge pull request #13169 from jfrazelle/cleanup-integration
...
cleanup test-integration
Upstream-commit: 3401ee13f838d7d579f6165cc4801ce419f929ff
Component: engine
2015-05-13 06:34:30 +02:00
af27a9480d
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
2015-05-13 05:23:56 +02:00
276b0e4ce0
integ-cli: Fix race in TestLogsSince
...
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 2fe2f7a1864068e7d268833bb40536064f69b8aa
Component: engine
2015-05-13 02:59:11 +00:00
d58b604612
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
2015-05-12 18:24:04 -07:00
71c213ec0b
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
Upstream-commit: 3985f1781228d6060228d83e559f14e6d7cc9d7c
Component: engine
2015-05-12 18:04:33 -07:00
9c4dfe4f27
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
Upstream-commit: ec4baad9549448f409af5ec98fa0737b94512824
Component: engine
2015-05-12 20:28:18 -04:00
2e83148ffd
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
2015-05-12 17:22:41 -07:00
c55bc07730
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
Upstream-commit: df89008f0ce17a1ffdbde6a59ef0eade0e885ed8
Component: engine
2015-05-12 16:07:43 -07:00
605da98d23
cleanup test-integration
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: e096d56713b23e076f1adc618b5fd765d9485b45
Component: engine
2015-05-12 15:39:57 -07:00
aeecef0f70
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
2015-05-13 00:09:41 +02:00
00f07a55d3
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7ae2a372d6d845040cdf40b246f4eec62512398
Component: engine
2015-05-12 14:41:02 -07:00
aaf186c8e8
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: aed8f9f76e16ed7acc49fbdef5f4563834ac5167
Component: engine
2015-05-12 14:26:57 -07:00
fe20784d8c
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
Upstream-commit: 37cb2a15bf05f8d0b12423230f57998e90d5d8a2
Component: engine
2015-05-12 13:52:49 -07:00
de6eaa3d3d
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
Upstream-commit: cb53a628b0b722cac24586bd3bef578a5a8e6ed8
Component: engine
2015-05-12 13:49:47 -07:00
ebd56edbe7
Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter
...
modprobe br_netfilter
Upstream-commit: e0777e69cba057d7c7da360ed2745d9de8b61ed2
Component: engine
2015-05-12 13:46:34 -07:00
ac35a75674
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
Upstream-commit: f35038dfba2bae0f2183a0caa366e8d7cb959220
Component: engine
2015-05-12 13:08:36 -07:00
b1b57c9cd4
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 3a8728b431df07249ad913ea9a12e27dc39b8956
Component: engine
2015-05-12 19:11:52 +00:00
15c4056588
Merge pull request #12847 from cpuguy83/fix_firewald_errors
...
Fix error message on firewalld init
Upstream-commit: b0518fe0383bff573f8743d179b1cd6df9f5e1e1
Component: engine
2015-05-12 12:01:59 -07:00
a641944b1d
this fixes hairpin nat tryinng to ping a the host and port from inside a container
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 4800d4df8c25b0403482bb3ea55891b7091d89f9
Component: engine
2015-05-12 11:57:36 -07:00
b33908cc47
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
Upstream-commit: 73387bf15a3f3a35192cb78aefa5c32e1569cb5c
Component: engine
2015-05-12 11:36:55 -07:00
c0a71ed02d
Merge pull request #13127 from shishir-a412ed/exec_opt_doc
...
Missing exec-opt[] option in CommandLine docs
Upstream-commit: 5bf2ebf0a5d6eb9043d32dfcee7a4c8beb4e4a7f
Component: engine
2015-05-12 11:34:51 -07:00
4a0ddadbc0
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
2015-05-12 20:09:49 +02:00
2535832c36
Merge pull request #13141 from vieux/fallback_inspect
...
fallback to interface with docker inspect
Upstream-commit: d4eba300657cc60ca03fe774bb42ad6b6f9eca54
Component: engine
2015-05-12 11:02:06 -07:00
ab6ce6666a
Merge pull request #13151 from Mic92/master
...
zfs: update filesystem cache on filesystem creation/deletion
Upstream-commit: 445afe09770bccbb9929f5e05c47d73a1d59298a
Component: engine
2015-05-12 10:53:01 -07:00
792a1ace8a
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e3ba3dd5b828307c3970d0036b019eca405e4a2c
Component: engine
2015-05-12 13:50:51 -04:00
f387cad768
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
Upstream-commit: c9821d8dd629cbd4fc0b11c9f593267042c2d718
Component: engine
2015-05-12 10:32:01 -07:00
baa93a3d54
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
2015-05-12 10:27:43 -07:00
b60e82567d
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
2015-05-12 09:40:16 -04:00
9a838129e5
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: 2cb23527e4f3f74a9fb98ddc7c0c11c50c3f07d2
Component: engine
2015-05-12 13:06:41 +02:00
71b540c581
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a8250a0b20006bae669f9d127eaf00d4284e1d9f
Component: engine
2015-05-12 18:02:30 +08:00
6a33f440dd
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
Upstream-commit: a5007e5737fac5904b61f49c8a7fd6fc29f83330
Component: engine
2015-05-11 21:20:44 -04:00
b969f88e8d
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 52c3bb6a0ec35f34550944b8895d7727301791c9
Component: engine
2015-05-11 17:39:21 -07:00
c0e7d1e48e
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 95fcf76cc64a4acf95c168e8d8607e3acf405c13
Component: engine
2015-05-12 10:09:23 +10:00
5a91f639c0
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
b4bae162cd
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
Upstream-commit: c49695f976ab97dc8c7a249f5211d9e0fcb2c24c
Component: engine
2015-05-12 09:07:55 +10:00
56b6d8326b
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: c5e93d095005e8b336b845cb94d95f55a594b3ce
Component: engine
2015-05-11 23:07:22 +00:00
d3339de046
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 78604a9f3fc7d08b39fea0e80dafaa6f8472b050
Component: engine
2015-05-11 15:28:08 -07:00
