Merge pull request #22171 from mlaventure/always-disable-metrics

Always disable containerd metrics when started by docker
This commit is contained in:
Sebastiaan van Stijn 2016-04-21 01:38:07 +02:00
commit ccf83c94d1
1 changed files with 2 additions and 2 deletions

View File

@ -349,9 +349,9 @@ func (r *remote) runContainerdDaemon() error {
} }
// Start a new instance // Start a new instance
args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"} args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc", "--metrics-interval=0"}
if r.debugLog { if r.debugLog {
args = append(args, "--debug", "--metrics-interval=0") args = append(args, "--debug")
} }
if len(r.runtimeArgs) > 0 { if len(r.runtimeArgs) > 0 {
for _, v := range r.runtimeArgs { for _, v := range r.runtimeArgs {