p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
16,341 Commits 2 Branches 295 Tags
36ffb60b9beeff80677a1dbfa3bfcf46e698d01f
Commit Graph

28 Commits

Author SHA1 Message Date
Zefan Li
46e26ed16e Fix sysinfo regression 
The cleanup to sysinfo package introduced a regression.

If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.

Signed-off-by: Zefan Li <lizefan@huawei.com>
Upstream-commit: 439869320177f56a559ef189f5ce29f24cf99e12
Component: engine
 2015-06-19 09:44:23 +08:00
Brian Goff
73618ddb2e cleanup sysinfo package 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9b05aa6ee8e628695b3661b2c5a438f61330ba53
Component: engine
 2015-06-17 20:41:14 -04:00
Lei Jitang
a2d8dcc9ab Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 57d12a0e0aca49ddd4baad3d37b77f31d63ff70b
Component: engine
 2015-06-17 09:19:11 +08:00
John Howard
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
Qiang Huang
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
Ma Shimiao
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
HuKeping
ad3d66108b Feature: option for disable OOM killer 
Add cgroup support for disable OOM killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
 2015-05-04 21:11:29 +08:00
Brian Goff
135331b0d1 Merge pull request #12664 from Mashimiao/sysinfo-support-ipv4_forward-check 
sysinfo: add IPv4Forwarding check
Upstream-commit: fc9033a9c89a86e28d77053b0737aecbb068246d
Component: engine
 2015-04-30 11:44:44 -04:00
Qiang Huang
22db717a0c simplify memory limit check 
If memory cgroup is mounted, memory limit is always supported,
no need to check if these files are exist.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 667b1e220cf82fb77fd776426a4b712ae5fee0ae
Component: engine
 2015-04-24 08:43:44 +08:00
Qiang Huang
af1b9c60d9 add devices cgroup check and errors 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 47e5acfbaefc45e536b953af6bf8a3993669c816
Component: engine
 2015-04-24 08:37:59 +08:00
Ma Shimiao
44bb7756b2 sysinfo: add IPv4Forwarding check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 05418df539dfed118da099aacfe4250f2f6ad5e0
Component: engine
 2015-04-23 12:19:46 +08:00
Qiang Huang
3a0cec3089 remove redundant warning 
And warning is not supposed to have a prefix WARNING.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f3dc35169780e1555b4116986649b729cb80b5d1
Component: engine
 2015-04-22 08:15:00 +08:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Eric Rafaloff
e9805495bf Update inline doc for New 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 3716df57c097803dec220ff95fffdae8394145fc
Component: engine
 2015-03-27 13:55:22 -04:00
Eric Rafaloff
cce1904e9d Add missing . in comment 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 6abe160eaec49c693b69d14304fe39d78ea4abb4
Component: engine
 2015-03-26 23:22:05 -04:00
Eric Rafaloff
b0def5e5a0 Add some basic doc for SysInfo 
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 01bbc3fbb9c3ab3dec0f271710739465b0f80b7a
Component: engine
 2015-03-26 23:05:07 -04:00
Antonio Murdaca
e5b36a723c Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
 2015-03-26 23:22:04 +01:00
Qiang Huang
ad6ee8ec46 fix warning messages 
Use log.Warnf instead of log.Infof, and remove redundant `WARNING` prefix.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: bffe04b582d143f074297b260a359dfb54a7763b
Component: engine
 2015-03-11 08:47:45 +08:00
Arnaud Porterie
5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Victor Vieux
1429a5fb4a update sysinfo to logrus 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0a37f836adef969e9e5aa9ce7b2c465f9441c1a5
Component: engine
 2014-10-27 18:59:02 +00:00
Victor Vieux
86a79a73e0 update MAINTAINERS files 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 06248d745a6a69b14595a699e0e5b3e883d8ea3a
Component: engine
 2014-06-16 22:20:07 +00:00
Solomon Hykes
76dc816a6e Guillaume is busy full-time on his new business, and no longer available 
as a maintainer.

Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
 2014-06-16 06:22:15 -07:00
Michael Crosby
52b8a282c3 Update libcontainer imports 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8194556337b65dda71a3d4d7f6ae9653ad5a19a0
Component: engine
 2014-06-10 19:58:15 -07:00
Michael Crosby
910f9d50e2 Move cgroups package into libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3b7a19def609c8fbadc6559e7f47f8a5a7769a5b
Component: engine
 2014-05-14 15:21:44 -07:00
Josh Poimboeuf
c17d7923cb remove ip_forward warning 
Now that docker sets /proc/sys/net/ipv4/ip_forward by default (unless
the user manually specifies "-ip-forward=false"), there's no need to
warn if its disabled.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: ef6c0d53410c0be6f33d049e7998b54804497350
Component: engine
 2014-01-28 13:27:56 -06:00
Paul Nasrat
c8d1294225 Extract cgroups pkg. 
Initial move before enhancing cgroups package.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 2553029959929184696e25ebdba4631ba7aeb8a6
Component: engine
 2014-01-20 14:15:44 -05:00
Guillaume J. Charmes
642babd6eb Add MAINTAINER and remove docker/utils dep from pkg/sysinfo 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: ff662446f774d573442baa526263544df2570ebf
Component: engine
 2014-01-20 10:20:29 -08:00
Guillaume J. Charmes
72a4c2e064 Rename Capabilities in sysinfo and move it to its own subpackage 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
 2014-01-17 17:42:58 -08:00