038196ed40
Merge pull request #13219 from brahmaroutu/gccgo_compile_issue
...
fix to gccgo compilation error
Upstream-commit: 472538bee00d0c665ed43ff1a3db7531a8e28d65
Component: engine
2015-05-18 20:43:47 -04:00
34e0bf8384
Fix panic when using default-initialized FlagSet
...
Closes #13294
Signed-off-by: Sebastien Rannou <mxs@sbrk.org >
Upstream-commit: e94bab8278ed5672d75a4c1121ef4a6c3febc5b9
Component: engine
2015-05-18 11:55:38 +02:00
c1aed4887a
Fixing a Typo in plugins mime-type
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 215a5ebdb6c36f63ff4d6294f2d1b29f87b6af40
Component: engine
2015-05-16 08:49:23 -07:00
07c8ebe4df
Merge pull request #13222 from calavera/plugins_infra
...
Remote plugins plumbing.
Upstream-commit: 115b11ae69d107e163034a1cfa9fd4d8e33ff00f
Component: engine
2015-05-15 16:37:55 -07:00
377836e4b2
Allow to call back when a plugin is loaded.
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba3bcf053749543a1643421d7fa5f680a49ee1a8
Component: engine
2015-05-15 13:50:44 -07:00
dbb89bcdab
Remote plugins plumbing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 839d64ffb157ba170fb644a42f5096f334b7cc48
Component: engine
2015-05-15 11:04:58 -07:00
3d94b2d4e8
Merge pull request #13220 from Microsoft/10662-sysinfo
...
Windows: Refactor sysinfo for compilation
Upstream-commit: 248e5a4c8351e7dcf0db73808e3581d73e2ed135
Component: engine
2015-05-15 10:53:55 -04:00
f9e7dda027
Remove redundant log in pkg/pidfile/pidfile.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 60e5c273cfde9fac1ac09ebcc666977232115f65
Component: engine
2015-05-15 15:26:00 +08:00
5edd0d62d2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
Upstream-commit: e4855eebf229fa1ebddf254a6c32804425ae8c56
Component: engine
2015-05-14 16:49:01 -07:00
fb9d7fcfdc
Windows: Refactor sysinfo for compilation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b7ee717a10db00858c441f78f2f1a47e2a9493a1
Component: engine
2015-05-14 09:44:51 -07:00
a587ee906f
fix to gccgo compilation error
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: d2a2c974d9d0862ddd9974c861c080159a53cd4b
Component: engine
2015-05-14 16:28:23 +00:00
c16c9cc586
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 999f464feb5b78e8ecc97625e70f3b1796d0a758
Component: engine
2015-05-14 07:44:42 +00:00
cd070e7fe0
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
Upstream-commit: 64ea54c0ed3f0daff40402259e3a2566a51cd4fe
Component: engine
2015-05-13 15:24:01 -07: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
4627e314ec
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c6dad07b1bc585f98439dd87deadec062188cbb5
Component: engine
2015-05-13 11:04:07 +08: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
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
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
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
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
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
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
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
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
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
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
365c18080f
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
ab315ef02f
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
c55979eeda
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
Upstream-commit: 61cb6012e6b4085f9c867d826431368bb18896c8
Component: engine
2015-05-09 09:38:42 -07:00
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
c39c5e2a47
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 64715c4f33fdb98003b7fda8d1dcf9c65463de07
Component: engine
2015-05-08 14:15:53 -07:00
20802b8b53
Fix error message on firewalld init
...
If firewalld is not installed (or I suppose not running), firewalld was
producing an error in the daemon init logs, even though firewalld is not
required for iptables stuff to function.
The firewalld library code was also logging directly to logrus instead
of returning errors.
Moved logging code higher up in the stack and changed firewalld code to
return errors where appropriate.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 38b5c7266a14c34624bba532cb74d8b2ae46c726
Component: engine
2015-05-08 15:51:44 -04:00
a9af2bce60
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
d482451b94
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
Upstream-commit: f6fa579d52a446d6a8171330ddad73602c79dd30
Component: engine
2015-05-07 17:02:58 -07:00
3bf284f32f
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
Upstream-commit: d0cbaeb0d28091ce4cddd1aead79b51671529fe7
Component: engine
2015-05-07 17:00:26 -07:00
a555add607
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
Upstream-commit: 237bd23af85dc2624e973534bca1caa8741ab8f6
Component: engine
2015-05-07 16:16:52 -07:00
2ee6387cbc
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
f128089535
Remove Sync() call in NewTempArchive:
...
This makes the "Buffering to disk" part of `docker push` 70% faster in
my use-case (having already applied #12833 ).
fsync'ing here serves no valuable purpose: if the drive's operation is
interrupted, so it the program's, and this archive has no value other
than the immediate and transient one.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: 236dbc2e59f5b665f9fa30f3f7ba1fe6c8483b24
Component: engine
2015-05-07 12:58:12 -04:00
d7e8665b03
Add --userland-proxy daemon flag
...
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.
Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
2015-05-04 16:07:45 -07:00
11e5be135f
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
Upstream-commit: 56c991781564e8cc292166d3b3e27e304c240468
Component: engine
2015-05-04 14:22:52 -07:00
e79952cb66
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
Upstream-commit: 3fcf387d52676d9c4f24b7a4d2f48c4992d7485f
Component: engine
2015-05-04 15:51:56 -04:00
f81d4d4161
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
2015-05-04 12:48:24 -07:00
204fb1504f
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
Upstream-commit: 87a0ca5283aa5b1c3d04cc35e1c415de6b00d323
Component: engine
2015-05-04 14:57:58 -04:00
f23ef4fe69
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 815b472a02dc0f593daee4006ce893fe17236b70
Component: engine
2015-05-04 19:56:10 +02:00
a0ae4df58b
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
2015-05-04 09:28:06 -07:00
9eba4b1b6c
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
Upstream-commit: ac324e5e52af1f2489320f3bdb7e2ebbd83ee869
Component: engine
2015-05-04 11:53:05 -04:00
