opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-30 15:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman start: remove container if needed

Browse Source 
Like podman run --rm, start --attach must also ensure the contianer is
removed before it exist. Otherwise there is a race where the container
still exist after the command exits, because removal would only happen
by the cleanup process in the background.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-04-24 15:32:50 +02:00
parent 3a2d7587fe
commit 0eac57ed31
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/domain/infra/abi/containers.go
View File

@ -958,6 +958,12 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
for i := range containers { for i := range containers {
ctr := containers[i] ctr := containers[i]
removeContainer := func() {
if _, _, err := ic.removeContainer(ctx, ctr.Container, entities.RmOptions{}); err != nil {
logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
}
}
if options.Attach { if options.Attach {
err = terminal.StartAttachCtr(ctx, ctr.Container, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, true) err = terminal.StartAttachCtr(ctx, ctr.Container, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, true)
if errors.Is(err, define.ErrDetach) { if errors.Is(err, define.ErrDetach) {
@ -991,9 +997,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
ExitCode: exitCode, ExitCode: exitCode,
}) })
if ctr.AutoRemove() { if ctr.AutoRemove() {
if _, _, err := ic.removeContainer(ctx, ctr.Container, entities.RmOptions{}); err != nil { removeContainer()
logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
}
} }
return reports, fmt.Errorf("unable to start container %s: %w", ctr.ID(), err) return reports, fmt.Errorf("unable to start container %s: %w", ctr.ID(), err)
} }
@ -1002,6 +1006,9 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
if err2 != nil { if err2 != nil {
logrus.Errorf("Waiting for container %s: %v", ctr.ID(), err2) logrus.Errorf("Waiting for container %s: %v", ctr.ID(), err2)
} }
if ctr.AutoRemove() && !ctr.ShouldRestart(ctx) {
removeContainer()
}
reports = append(reports, &entities.ContainerStartReport{ reports = append(reports, &entities.ContainerStartReport{
Id: ctr.ID(), Id: ctr.ID(),
RawInput: ctr.rawInput, RawInput: ctr.rawInput,
@ -1038,9 +1045,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
} }
report.Err = fmt.Errorf("unable to start container %q: %w", ctr.ID(), err) report.Err = fmt.Errorf("unable to start container %q: %w", ctr.ID(), err)
if ctr.AutoRemove() { if ctr.AutoRemove() {
if _, _, err := ic.removeContainer(ctx, ctr.Container, entities.RmOptions{}); err != nil { removeContainer()
logrus.Errorf("Removing container %s: %v", ctr.ID(), err)
}
} }
reports = append(reports, report) reports = append(reports, report)
continue continue