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

Include PATH in conmon env. #15734

Merged
merged 1 commit into from
Sep 11, 2022
Merged

Conversation

KenMacD
Copy link
Contributor

@KenMacD KenMacD commented Sep 10, 2022

Pass along the path so that when conmon calls podman as part of the exit command podman has the correct path.

Also adjusted the CONTAINERS_CONF lookup to match the codestyle of other environment lookups.

Resolves #15707

Does this PR introduce a user-facing change?

Pass PATH and CONTAINERS_HELPER_BINARY_DIR environment variables to conmon calls

@openshift-ci openshift-ci bot added the do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None label Sep 10, 2022
@mheon
Copy link
Member

mheon commented Sep 10, 2022

Please add a release note briefly describing what this change does. Otherwise, LGTM

@openshift-ci openshift-ci bot added release-note and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Sep 10, 2022
@Luap99
Copy link
Member

Luap99 commented Sep 10, 2022

We should also set CONTAINERS_HELPER_BINARY_DIR

Include the path and helper binary dir so that the podman
environment more closely matches when conmon calls it as an
exit command.

Also match the CONTAINERS_CONF lookup to the codestyle of other
environment lookups.

[NO NEW TESTS NEEDED]

Resolves #15707

Signed-off-by: Kenny MacDermid <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Sep 11, 2022

/approve
/lgtm
Thanks @KenMacD

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 11, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: KenMacD, 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 11, 2022
@openshift-merge-robot openshift-merge-robot merged commit 940d3d8 into containers:main Sep 11, 2022
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Thanks, @KenMacD !

@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 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 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. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CreateExitCommandArgs's podmanPath can be invalid
6 participants