pkg/domain/infra/tunnel: ignore error from removeContainer()

All callers ignore the error anyways so no reason to return it as the
function itself already logs it.

Signed-off-by: Paul Holzinger <[email protected]>

Author: Luap99

pkg/domain/infra/tunnel/containers.go

@@ -872,7 +872,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	for _, w := range con.Warnings {
 		fmt.Fprintf(os.Stderr, "%s\n", w)
 	}
-	removeContainer := func(id, CIDFile string, force bool) error {
+	removeContainer := func(id, CIDFile string, force bool) {
 		if CIDFile != "" {
 			if err := os.Remove(CIDFile); err != nil && !errors.Is(err, os.ErrNotExist) {
 				logrus.Warnf("Cleaning up CID file: %s", err)
@@ -882,13 +882,12 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 		removeOptions := new(containers.RemoveOptions).WithVolumes(true).WithForce(force)
 		reports, err := containers.Remove(ic.ClientCtx, id, removeOptions)
 		logIfRmError(id, err, reports)
-		return err
 	}
 
 	if opts.CIDFile != "" {
 		if err := util.CreateIDFile(opts.CIDFile, con.ID); err != nil {
 			// If you fail to create CIDFile then remove the container
-			_ = removeContainer(con.ID, opts.CIDFile, true)
+			removeContainer(con.ID, opts.CIDFile, true)
 			return nil, err
 		}
 	}
@@ -901,7 +900,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 		if err != nil {
 			report.ExitCode = define.ExitCode(err)
 			if opts.Rm {
-				_ = removeContainer(con.ID, opts.CIDFile, true)
+				removeContainer(con.ID, opts.CIDFile, true)
 			}
 		}
 		return &report, err
@@ -924,15 +923,13 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 
 		report.ExitCode = define.ExitCode(err)
 		if opts.Rm {
-			_ = removeContainer(con.ID, opts.CIDFile, false)
+			removeContainer(con.ID, opts.CIDFile, false)
 		}
 		return &report, err
 	}
 
 	if opts.Rm {
-		// Defer the removal, so we can return early if needed and
-		// de-spaghetti the code.
-		defer removeContainer(con.ID, opts.CIDFile, false)
+		removeContainer(con.ID, opts.CIDFile, false)
 	}
 
 	report.ExitCode = code