|
|
57432b4d63
|
Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup
Fix docker status incorrectly reports containerized
Upstream-commit: c84f5dfd7431dfef94a073b47f591515a58d9e00
Component: engine
|
2015-11-30 11:47:16 -08:00 |
|
|
|
eb219a3ce5
|
Use /usr/lib/os-release if /etc/os-release is missing.
As per os-release spec, /usr/lib/os-release file should be tried if
/etc/os-release is missing.
http://www.freedesktop.org/software/systemd/man/os-release.html
Thanks James Hunt <james.o.hunt@intel.com> and
Dimitri John Ledkov <dimitri.j.ledkov@intel.com> for contribution.
Close #17174
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 292a15e40a7201801fb9b0abd81175fd0a09a814
Component: engine
|
2015-11-16 16:21:31 -08:00 |
|
|
|
85d3458e13
|
Fix panic in parsing /etc/os-release
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7b102dc11486539bc661a4d858e2de3ce3f46493
Component: engine
|
2015-11-05 19:59:29 +01:00 |
|
|
|
2573eeaeb3
|
Fix docker status incorrectly reports containerized. Fixes #17037
Signed-off-by: Peter Malmgren <ptmalmgren@gmail.com>
Upstream-commit: f6896b61ff8142ce22d06ab447f0efdc0addc326
Component: engine
|
2015-11-04 00:08:46 +00:00 |
|
|
|
761f97e89e
|
Windows: Fix unit tests parsers\os
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a40c82804038fdc8b7051aa0b4ba27974c895e36
Component: engine
|
2015-11-02 11:28:47 -08:00 |
|
|
|
59df5a01ec
|
make docker compile on freebsd
Signed-off-by: Alexey Guskov <lexag@mail.ru>
Upstream-commit: 26c03d561ab126287bb3034cc23477d18869a888
Component: engine
|
2015-07-29 21:25:56 +03:00 |
|
|
|
2db54e3ac2
|
Lint on pkg/* packages
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 18c7c67308bd4a24a41028e63c2603bb74eac85e
Component: engine
|
2015-07-27 21:26:21 +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 |
|
|
|
e71a5595e6
|
Fix the unit test not to remove /tmp
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: 2329354dc3e874b6e93b7b9feafa9c67172840fc
Component: engine
|
2014-11-07 02:43:59 +09:00 |
|
|
|
ca4826fd77
|
Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
|
2014-07-30 10:37:52 -04:00 |
|
