diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-20 17:58:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 17:58:11 -0500 |
| commit | 14443ccdfc19a7d719c63937ce76bfddf01f88e2 (patch) | |
| tree | 3b3270237f9d3837668733e7364feb029037d437 /pkg/domain/infra/tunnel | |
| parent | fe4f9ba303affde0b838e19c862b45206ae2feed (diff) | |
| parent | e7df73efadd36e2489954ee9a766a3fbfe4eafeb (diff) | |
| download | podman-14443ccdfc19a7d719c63937ce76bfddf01f88e2.tar.gz podman-14443ccdfc19a7d719c63937ce76bfddf01f88e2.tar.bz2 podman-14443ccdfc19a7d719c63937ce76bfddf01f88e2.zip | |
Merge pull request #9014 from rhatdan/rm
Fix handling of container remove
Diffstat (limited to 'pkg/domain/infra/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 84a07f8e9..524b29553 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -173,14 +173,6 @@ func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []st } func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, opts entities.RmOptions) ([]*entities.RmReport, error) { - for _, cidFile := range opts.CIDFiles { - content, err := ioutil.ReadFile(cidFile) - if err != nil { - return nil, errors.Wrap(err, "error reading CIDFile") - } - id := strings.Split(string(content), "\n")[0] - namesOrIds = append(namesOrIds, id) - } ctrs, err := getContainersByContext(ic.ClientCtx, opts.All, opts.Ignore, namesOrIds) if err != nil { return nil, err |