diff options
| author | W. Trevor King <wking@tremily.us> | 2018-05-31 11:47:17 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-04 18:36:40 +0000 |
| commit | c9f763456cd8263c3f2d84c6b2b6e17ad81cf3ba (patch) | |
| tree | b1cffd82978145f372893f62754432d75003b31d /cmd/podman | |
| parent | 28d1cec9f64cca11d42410c6e33c43b01b1d7678 (diff) | |
| download | podman-c9f763456cd8263c3f2d84c6b2b6e17ad81cf3ba.tar.gz podman-c9f763456cd8263c3f2d84c6b2b6e17ad81cf3ba.tar.bz2 podman-c9f763456cd8263c3f2d84c6b2b6e17ad81cf3ba.zip | |
libpod: Execute poststop hooks locally
Instead of delegating to the runtime, since some runtimes do not seem
to handle these reliably [1].
[1]: https://github.com/projectatomic/libpod/issues/730#issuecomment-392959938
Signed-off-by: W. Trevor King <wking@tremily.us>
Closes: #864
Approved by: rhatdan
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/rm.go | 3 | ||||
| -rw-r--r-- | cmd/podman/rmi.go | 3 | ||||
| -rw-r--r-- | cmd/podman/run.go | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index d6af6db07..9fc65cb4d 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -37,6 +37,7 @@ var ( // saveCmd saves the image to either docker-archive or oci func rmCmd(c *cli.Context) error { + ctx := getContext() if err := validateFlags(c, rmFlags); err != nil { return err } @@ -81,7 +82,7 @@ func rmCmd(c *cli.Context) error { } } for _, container := range delContainers { - err = runtime.RemoveContainer(container, c.Bool("force")) + err = runtime.RemoveContainer(ctx, container, c.Bool("force")) if err != nil { if lastError != nil { fmt.Fprintln(os.Stderr, lastError) diff --git a/cmd/podman/rmi.go b/cmd/podman/rmi.go index dcf46a8e5..97c5b38cf 100644 --- a/cmd/podman/rmi.go +++ b/cmd/podman/rmi.go @@ -35,6 +35,7 @@ var ( ) func rmiCmd(c *cli.Context) error { + ctx := getContext() if err := validateFlags(c, rmiFlags); err != nil { return err } @@ -76,7 +77,7 @@ func rmiCmd(c *cli.Context) error { return errors.Errorf("no valid images to delete") } for _, img := range imagesToDelete { - msg, err := runtime.RemoveImage(img, c.Bool("force")) + msg, err := runtime.RemoveImage(ctx, img, c.Bool("force")) if err != nil { if errors.Cause(err) == storage.ErrImageUsedByContainer { fmt.Printf("A container associated with containers/storage, i.e. via Buildah, CRI-O, etc., may be associated with this image: %-12.12s\n", img.ID()) diff --git a/cmd/podman/run.go b/cmd/podman/run.go index f12a241fa..d6755df5e 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -225,7 +225,7 @@ func runCmd(c *cli.Context) error { } if createConfig.Rm { - return runtime.RemoveContainer(ctr, true) + return runtime.RemoveContainer(ctx, ctr, true) } if err := ctr.Cleanup(); err != nil { |