0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: translateContainerdStartErr(): remove unused cmd argument

Browse source 
This argument was no longer used since commit 225e046d9d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-02-16 15:04:09 +01:00
parent 087369aeeb
commit 2cf09c5446
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/errors.go
View file

@ -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)

2
daemon/exec.go
View file

@ -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()

4
daemon/start.go
View file

@ -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

2
daemon/start_unix.go
View file

@ -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