From 1af1a20a0db434fc7252992dec7be52c4196b5be Mon Sep 17 00:00:00 2001
From: Dave Tucker <dave@dtucker.co.uk>
Date: Thu, 1 Jun 2017 15:56:44 +0100
Subject: [PATCH] containerd: Don't expose metrics by default

This can be turned on if required but we'll default to leaving it off
It's been enabled in the top-level linuxkit.yml
This port is also non-standard and there doesn't appear to be a standard
port for this as yet.

Signed-off-by: Dave Tucker <dt@docker.com>
---
 linuxkit.yml                              | 18 ++++++++++++++++++
 pkg/containerd/etc/containerd/config.toml |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/linuxkit.yml b/linuxkit.yml
index 48ccd97a5..f6cc13756 100644
--- a/linuxkit.yml
+++ b/linuxkit.yml
@@ -28,6 +28,24 @@ services:
 files:
   - path: etc/docker/daemon.json
     contents: '{"debug": true}'
+  - path: etc/containerd/config.toml
+    contents: |
+      state = "/run/containerd"
+      root = "/var/lib/containerd"
+      snapshotter = "overlay"
+      subreaper = false
+
+      [grpc]
+      address = "/run/containerd/containerd.sock"
+      uid = 0
+      gid = 0
+
+      [debug]
+      address = "/run/containerd/debug.sock"
+      level = "info"
+
+      [metrics]
+      address = ":13337"
 trust:
   org:
     - linuxkit
diff --git a/pkg/containerd/etc/containerd/config.toml b/pkg/containerd/etc/containerd/config.toml
index 6968014e5..74e36918b 100644
--- a/pkg/containerd/etc/containerd/config.toml
+++ b/pkg/containerd/etc/containerd/config.toml
@@ -13,4 +13,4 @@ subreaper = false
   level = "info"
 
 [metrics]
-  address = ":13337"
+  address = ""