diff --git a/daemon/errors.go b/daemon/errors.go index 6ab45f30e3..b85feaa2f1 100644 --- a/daemon/errors.go +++ b/daemon/errors.go @@ -132,7 +132,7 @@ func (e startInvalidConfigError) Error() string { func (e startInvalidConfigError) InvalidParameter() {} // Is this right??? -func translateContainerdStartErr(cmd string, setExitCode func(int), err error) error { +func translateContainerdStartErr(setExitCode func(int), err error) error { errDesc := status.Convert(err).Message() contains := func(s1, s2 string) bool { return strings.Contains(strings.ToLower(s1), s2) diff --git a/daemon/exec.go b/daemon/exec.go index d4e5ab3df2..4072e4e0b9 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -288,7 +288,7 @@ func (daemon *Daemon) ContainerExecStart(ctx context.Context, name string, optio close(ec.Started) if err != nil { defer ec.Unlock() - return translateContainerdStartErr(ec.Entrypoint, ec.SetExitCode, err) + return translateContainerdStartErr(ec.SetExitCode, err) } ec.Unlock() diff --git a/daemon/start.go b/daemon/start.go index 825f39b78f..4463083009 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -179,7 +179,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C ctr, err := libcontainerd.ReplaceContainer(ctx, daemon.containerd, container.ID, spec, shim, createOptions) if err != nil { - return translateContainerdStartErr(container.Path, container.SetExitCode, err) + return translateContainerdStartErr(container.SetExitCode, err) } // TODO(mlaventure): we need to specify checkpoint options here @@ -191,7 +191,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C logrus.WithError(err).WithField("container", container.ID). Error("failed to delete failed start container") } - return translateContainerdStartErr(container.Path, container.SetExitCode, err) + return translateContainerdStartErr(container.SetExitCode, err) } container.HasBeenManuallyRestarted = false diff --git a/daemon/start_unix.go b/daemon/start_unix.go index 2f66c00105..6a9e770b09 100644 --- a/daemon/start_unix.go +++ b/daemon/start_unix.go @@ -17,7 +17,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain rt, err := daemon.getRuntime(container.HostConfig.Runtime) if err != nil { - return "", nil, translateContainerdStartErr(container.Path, container.SetExitCode, err) + return "", nil, translateContainerdStartErr(container.SetExitCode, err) } return rt.Shim.Binary, rt.Shim.Opts, nil