diff options
| author | Matthew Heon <mheon@redhat.com> | 2018-12-05 09:25:44 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2018-12-06 09:10:45 -0500 |
| commit | e5335fd74c7ed6fe0fa55bf33afbdab23ed687f1 (patch) | |
| tree | 5b0b13368501604b9180f58aab98682156ced074 | |
| parent | b945d9128a0988ee006a8c743127cf1edc9cb47b (diff) | |
| download | podman-e5335fd74c7ed6fe0fa55bf33afbdab23ed687f1.tar.gz podman-e5335fd74c7ed6fe0fa55bf33afbdab23ed687f1.tar.bz2 podman-e5335fd74c7ed6fe0fa55bf33afbdab23ed687f1.zip | |
Remove --sync flag from `podman rm`
Per discussion with Dan, it would be better to automatically
handle potential runtime errors by automatically syncing if they
occur. Retaining the flag for `ps` makes sense, as we won't even
be calling the OCI runtime and as such won't see errors if the
state desyncs, but rm can be handled automatically.
The automatic desync handling code will take some additional work
so we'll land this as-is (sync on ps is enough to solve most
desync issues).
Signed-off-by: Matthew Heon <mheon@redhat.com>
| -rw-r--r-- | cmd/podman/rm.go | 10 | ||||
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-rm.1.md | 7 |
3 files changed, 0 insertions, 18 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 224df4543..7c0569b78 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -21,10 +21,6 @@ var ( }, LatestFlag, cli.BoolFlag{ - Name: "sync", - Usage: "Sync container state with OCI runtime before removing", - }, - cli.BoolFlag{ Name: "volumes, v", Usage: "Remove the volumes associated with the container (Not implemented yet)", }, @@ -77,12 +73,6 @@ func rmCmd(c *cli.Context) error { for _, container := range delContainers { con := container f := func() error { - if c.Bool("sync") { - if err := con.Sync(); err != nil { - return err - } - } - return runtime.RemoveContainer(ctx, con, c.Bool("force")) } diff --git a/completions/bash/podman b/completions/bash/podman index 1c21ab3d9..80ea53a74 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1828,7 +1828,6 @@ _podman_rm() { -h --latest -l - --sync --volumes -v " diff --git a/docs/podman-rm.1.md b/docs/podman-rm.1.md index 57274c523..56664a8c1 100644 --- a/docs/podman-rm.1.md +++ b/docs/podman-rm.1.md @@ -24,13 +24,6 @@ Remove all containers. Can be used in conjunction with -f as well. Instead of providing the container name or ID, use the last created container. If you use methods other than Podman to run containers such as CRI-O, the last started container could be from either of those methods. -**--sync** - -Force a sync of container state with the OCI runtime before attempting to remove the container. -In some cases, a container's state in the runtime can become out of sync with Podman's state, -which can cause Podman to refuse to remove containers because it believes they are still running. -A sync will resolve this issue. - **--volumes, -v** Remove the volumes associated with the container. (Not yet implemented) |