containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3307 from rhatdan/126 

If container is not in correct state podman exec should exit with 126
This commit is contained in:
OpenShift Merge Robot 2019-06-12 15:27:16 +02:00 committed by GitHub
parent d4681fafe5 3bbb692d80
commit 9faff31421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/exec.go
View File

@ -125,5 +125,10 @@ func execCmd(c *cliconfig.ExecValues) error {
streams.AttachError = true streams.AttachError = true
streams.AttachInput = true streams.AttachInput = true
return ctr.Exec(c.Tty, c.Privileged, envs, cmd, c.User, c.Workdir, streams, c.PreserveFDs) err = ctr.Exec(c.Tty, c.Privileged, envs, cmd, c.User, c.Workdir, streams, c.PreserveFDs)
if errors.Cause(err) == libpod.ErrCtrStateInvalid {
exitCode = 126
}
return err
} }

2
libpod/container_api.go
View File

@ -241,7 +241,7 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir
// TODO can probably relax this once we track exec sessions // TODO can probably relax this once we track exec sessions
if conState != ContainerStateRunning { if conState != ContainerStateRunning {
return errors.Errorf("cannot exec into container that is not running") return errors.Wrapf(ErrCtrStateInvalid, "cannot exec into container that is not running")
} }
if privileged || c.config.Privileged { if privileged || c.config.Privileged {
capList = caps.GetAllCapabilities() capList = caps.GetAllCapabilities()