Merge pull request #13306 from ahmetalpbalkan/logopts-context

Pass --log-opts map to logdrivers
Upstream-commit: cbc122e8a77493c521f23e1d9c1ba49d9108467e
Component: engine

components/engine/daemon/container.go

@@ -1452,6 +1452,7 @@ func (container *Container) getLogger() (logger.Logger, error) {
 		return nil, fmt.Errorf("Failed to get logging factory: %v", err)
 	}
 	ctx := logger.Context{
+		Config:        cfg.Config,
 		ContainerID:   container.ID,
 		ContainerName: container.Name,
 	}

components/engine/daemon/logger/factory.go

@@ -10,6 +10,7 @@ type Creator func(Context) (Logger, error)
 
 // Context provides enough information for a logging driver to do its function
 type Context struct {
+	Config        map[string]string
 	ContainerID   string
 	ContainerName string
 	LogPath       string