From 656cdbb0e96a1f8531b118caedd8e9b3d281c201 Mon Sep 17 00:00:00 2001 From: Daniel Dao Date: Tue, 11 Aug 2015 11:27:19 +0000 Subject: [PATCH] add env and labels to log context Signed-off-by: Daniel Dao --- daemon/container.go | 2 ++ daemon/logger/context.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/daemon/container.go b/daemon/container.go index 66ef0aac0..53807f90e 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -721,6 +721,8 @@ func (container *Container) getLogger() (logger.Logger, error) { ContainerImageID: container.ImageID, ContainerImageName: container.Config.Image, ContainerCreated: container.Created, + ContainerEnv: container.Config.Env, + ContainerLabels: container.Config.Labels, } // Set logging file for "json-logger" diff --git a/daemon/logger/context.go b/daemon/logger/context.go index 3526d563e..42820acb9 100644 --- a/daemon/logger/context.go +++ b/daemon/logger/context.go @@ -17,6 +17,8 @@ type Context struct { ContainerImageID string ContainerImageName string ContainerCreated time.Time + ContainerEnv []string + ContainerLabels map[string]string LogPath string }