diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 20:27:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 20:27:36 +0200 |
| commit | e90112a58c820fc20bf56727a3d1c19759ceed3e (patch) | |
| tree | b871c54a37ebdd00e6156284fd0d03d9b4ececf0 /pkg/domain/infra/tunnel | |
| parent | 5554698a4463a6d2543d3427d6e5e3d1ba3804fe (diff) | |
| parent | a7b3310db567309e8c21c4c49a37de9d18646a4c (diff) | |
| download | podman-e90112a58c820fc20bf56727a3d1c19759ceed3e.tar.gz podman-e90112a58c820fc20bf56727a3d1c19759ceed3e.tar.bz2 podman-e90112a58c820fc20bf56727a3d1c19759ceed3e.zip | |
Merge pull request #5984 from baude/v2intrestart
enable integration tests for restart
Diffstat (limited to 'pkg/domain/infra/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 18d6613f4..32f9c4e36 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -115,11 +115,15 @@ func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []st t := int(*options.Timeout) timeout = &t } + ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds) if err != nil { return nil, err } for _, c := range ctrs { + if options.Running && c.State != define.ContainerStateRunning.String() { + continue + } reports = append(reports, &entities.RestartReport{ Id: c.ID, Err: containers.Restart(ic.ClientCxt, c.ID, timeout), |