diff --git a/container/container_windows.go b/container/container_windows.go index 34b549fe91..11e255d82e 100644 --- a/container/container_windows.go +++ b/container/container_windows.go @@ -202,6 +202,6 @@ func (container *Container) ConfigsDirPath() string { } // ConfigFilePath returns the path to the on-disk location of a config. -func (container *Container) ConfigFilePath(configRef swarmtypes.ConfigReference) string { - return filepath.Join(container.ConfigsDirPath(), configRef.ConfigID) +func (container *Container) ConfigFilePath(configRef swarmtypes.ConfigReference) (string, error) { + return filepath.Join(container.ConfigsDirPath(), configRef.ConfigID), nil } diff --git a/daemon/container_operations_windows.go b/daemon/container_operations_windows.go index 6d84fe2dad..cc56bf4c79 100644 --- a/daemon/container_operations_windows.go +++ b/daemon/container_operations_windows.go @@ -55,7 +55,10 @@ func (daemon *Daemon) setupConfigDir(c *container.Container) (setupErr error) { continue } - fPath := c.ConfigFilePath(*configRef) + fPath, err := c.ConfigFilePath(*configRef) + if err != nil { + return errors.Wrap(err, "error getting config file path for container") + } log := logrus.WithFields(logrus.Fields{"name": configRef.File.Name, "path": fPath}) log.Debug("injecting config")