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

Should send the OCI runtime path not just the name to buildah #9906

Merged
merged 1 commit into from
Apr 1, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Mar 31, 2021

[NO TESTS NEEDED] Mainly because I have no idea how we would test
this.

Fixes: #9459

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 31, 2021
[NO TESTS NEEDED] Mainly because I have no idea how we would test
this.

Fixes: containers#9459

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan changed the title Should send the path not just the name Should send the OCI runtime path not just the name to buildah Mar 31, 2021
@mheon
Copy link
Member

mheon commented Mar 31, 2021

LGTM

// Make sure that build containers use the same runtime as Podman (see #9365).
conf := util.DefaultContainerConfig()
options.Runtime = conf.Engine.OCIRuntime
options.Runtime = r.GetOCIRuntimePath()
Copy link
Member

Choose a reason for hiding this comment

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

Could the default runtime ever differ from what's set in the containerConfig structure? If so, I'm not sure we'd want to do this.

Copy link
Member Author

Choose a reason for hiding this comment

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

They are stored in the same structure. We read it originally from the containers.conf, but if the user overrides it, we replace the value in the same structure.

@TomSweeneyRedHat
Copy link
Member

One question, if I'm off base with it, then LGTM.

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2021
@openshift-merge-robot openshift-merge-robot merged commit 12881ab into containers:master Apr 1, 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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 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
5 participants