From 42f9c25b5168e3bc8e19003cd8bfd4eabbad654c Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Tue, 19 Apr 2016 13:37:18 -0700
Subject: [PATCH] Always disable containerd metrics when started by docker

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 libcontainerd/remote_linux.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go
index 4f907abeca..a0023c55b5 100644
--- a/libcontainerd/remote_linux.go
+++ b/libcontainerd/remote_linux.go
@@ -349,9 +349,9 @@ func (r *remote) runContainerdDaemon() error {
 	}
 
 	// 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 {
-		args = append(args, "--debug", "--metrics-interval=0")
+		args = append(args, "--debug")
 	}
 	if len(r.runtimeArgs) > 0 {
 		for _, v := range r.runtimeArgs {