Lei Jitang
60e5c273cf
Remove redundant log in pkg/pidfile/pidfile.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-15 15:26:00 +08:00
David Calavera
e4855eebf2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
2015-05-14 16:49:01 -07:00
Ahmet Alp Balkan
999f464feb
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>
2015-05-14 07:44:42 +00:00
Alexander Morozov
64ea54c0ed
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
2015-05-13 15:24:01 -07:00
unclejack
cb08c1173f
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 21:48:48 +03:00
Lei Jitang
c6dad07b1b
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-13 11:04:07 +08:00
Brian Goff
ec4baad954
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
2015-05-12 20:28:18 -04:00
Jessie Frazelle
df89008f0c
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
2015-05-12 16:07:43 -07:00
Antonio Murdaca
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 00:09:41 +02:00
John Howard
f7ae2a372d
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-12 14:41:02 -07:00
Jessie Frazelle
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
Michael Crosby
cb53a628b0
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
2015-05-12 13:49:47 -07:00
Jessie Frazelle
b0518fe038
Merge pull request #12847 from cpuguy83/fix_firewald_errors
...
Fix error message on firewalld init
2015-05-12 12:01:59 -07:00
Brian Goff
e3ba3dd5b8
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>
2015-05-12 13:50:51 -04:00
Alexander Morozov
c9821d8dd6
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
2015-05-12 10:32:01 -07:00
Sebastiaan van Stijn
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
Qiang Huang
a8250a0b20
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-12 18:02:30 +08:00
Phil Estes
95fcf76cc6
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)
2015-05-12 10:09:23 +10:00
John Howard
78604a9f3f
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-11 15:28:08 -07:00
Jessie Frazelle
8cc93856e3
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
2015-05-11 13:18:29 -07:00
Antonio Murdaca
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 21:50:47 +02:00
Ahmet Alp Balkan
cb9a6b9aed
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>
2015-05-10 20:42:14 +00:00
Alexander Morozov
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
Alexander Morozov
61cb6012e6
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
2015-05-09 09:38:42 -07:00
Ma Shimiao
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
John Howard
64715c4f33
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-08 14:15:53 -07:00
Brian Goff
38b5c7266a
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>
2015-05-08 15:51:44 -04:00
Tianon Gravi
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-08 12:33:33 -06:00
Jessie Frazelle
f6fa579d52
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
2015-05-07 17:02:58 -07:00
Jessie Frazelle
d0cbaeb0d2
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
2015-05-07 17:00:26 -07:00
Jessie Frazelle
237bd23af8
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
2015-05-07 16:16:52 -07:00
Jessie Frazelle
74bfa36753
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
2015-05-07 14:01:16 -07:00
Burke Libbey
236dbc2e59
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>
2015-05-07 12:58:12 -04:00
Arnaud Porterie
f42348e18f
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>
2015-05-04 16:07:45 -07:00
Vincent Batts
56c9917815
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
2015-05-04 14:22:52 -07:00
Phil Estes
3fcf387d52
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
2015-05-04 15:51:56 -04:00
David Calavera
0a2ccb1cb5
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
2015-05-04 12:48:24 -07:00
Tibor Vass
87a0ca5283
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
2015-05-04 14:57:58 -04:00
Vincent Demeester
815b472a02
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-04 19:56:10 +02:00
David Calavera
49fd83a25e
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-04 09:28:06 -07:00
Sebastiaan van Stijn
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
unclejack
175339ffb6
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
2015-05-04 16:28:03 +03:00
HuKeping
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
Doug Davis
e8bbd87ba8
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
2015-05-03 11:09:25 -04:00
Daniel Zhang
28ea4a63d0
docker images
friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-05-03 21:19:18 +08:00
Tianon Gravi
b447fef7ec
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by 341a37095f
. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-02 23:25:57 -06:00
Tianon Gravi
576985a1dc
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-01 16:01:10 -06:00
Alexander Morozov
a05bcd12c4
Fix race in FirewalldInit
...
It was possible that signalHandler won't start because connections is
not assigned.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-01 13:35:54 -07:00
Michael Crosby
d2e380b687
Merge pull request #12841 from Mashimiao/use-CustomSize-to-replace-intToString
...
use CustomSize replace intToString
2015-04-30 17:24:41 -07:00
Michael Crosby
5221fd2ba5
Merge pull request #12900 from gaurav-gosec/master
...
Make use of iptablesPath variable which has the path of iptables, instea...
2015-04-30 16:12:03 -07:00