From 967e09a3a5ca40c82ab793377f151fcc8f207e57 Mon Sep 17 00:00:00 2001 From: Calum Lacroix Date: Wed, 8 Feb 2017 18:44:56 +0000 Subject: [PATCH] Checks environment variables for empty strings If an environment variable is an empty string, cadvisor panics and fails to start --- container/docker/handler.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index 291350df..23f48a44 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -252,9 +252,11 @@ func newDockerContainerHandler( // split env vars to get metadata map. for _, exposedEnv := range metadataEnvs { for _, envVar := range ctnr.Config.Env { - splits := strings.SplitN(envVar, "=", 2) - if splits[0] == exposedEnv { - handler.envs[strings.ToLower(exposedEnv)] = splits[1] + if envVar != "" { + splits := strings.SplitN(envVar, "=", 2) + if splits[0] == exposedEnv { + handler.envs[strings.ToLower(exposedEnv)] = splits[1] + } } } }