Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If container exits with 125 podman should exit with 125 #11545

Merged
merged 1 commit into from
Sep 13, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Sep 12, 2021

fixes: #11540

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2021
@rhatdan
Copy link
Member Author

rhatdan commented Sep 12, 2021

@jwhonce Any remembrance why you added this code?

diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 371ded9a8..cf712aa90 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -90,13 +90,6 @@ func init() {
 func Execute() {
        if err := rootCmd.ExecuteContext(registry.GetContextWithOptions()); err != nil {
                fmt.Fprintln(os.Stderr, formatError(err))
-       } else if registry.GetExitCode() == registry.ExecErrorCodeGeneric {
-               // The exitCode modified from registry.ExecErrorCodeGeneric,
-               // indicates an application
-               // running inside of a container failed, as opposed to the
-               // podman command failed.  Must exit with that exit code
-               // otherwise command exited correctly.
-               registry.SetExitCode(0)
        }
        os.Exit(registry.GetExitCode())
 }

cmd/podman/registry/registry.go Outdated Show resolved Hide resolved
cmd/podman/root.go Show resolved Hide resolved
@TomSweeneyRedHat
Copy link
Member

Changes LGTM but tests are unhappy and one comment that needs to be addressed.

@rhatdan
Copy link
Member Author

rhatdan commented Sep 13, 2021

@Luap99 PTAL

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Luap99
Copy link
Member

Luap99 commented Sep 13, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 13, 2021
@openshift-merge-robot openshift-merge-robot merged commit 473f958 into containers:main Sep 13, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman run silently succeeds when container command exits with code 125
4 participants