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

Pick default OCI Runtime from containers.conf #2929

Merged
merged 1 commit into from
Jan 25, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 23, 2021

Cherry-pick "Pick default OCI Runtime from containers.conf"

@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

Currently we have a weird situation where the user sets the default
runtime in his containers.conf for podman but Buildah is still falling
back to use runc because it was hard coded as the default for Buildah.

I would like to remove this default, but that would theoretically break
the API promise of Buildah.

This should fix containers/podman#8893

Signed-off-by: Daniel J Walsh <[email protected]>
@rhatdan
Copy link
Member Author

rhatdan commented Jan 23, 2021

@containers/podman-maintainers PTAL
@TomSweeneyRedHat @giuseppe @vrothberg @saschagrunert PTAL

buildah.go Outdated
@@ -28,7 +28,7 @@ const (
Package = "buildah"
// Version for the Package. Bump version in contrib/rpm/buildah.spec
// too.
Version = "1.19.2"
Version = "1.19.3"
Copy link
Member

Choose a reason for hiding this comment

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

you need to bump the contrib/rpm/buildah.spec too, and it would be good to update changelog.txt and CHANGELOG.md while you're at it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok I jumped the gun on this release, since there is at least one more thing we want to back port. Removing the release and only adding the cherry-pick

@TomSweeneyRedHat
Copy link
Member

Tests are unhappy, I think due to the missing verison in the spec. Beyond that, I really much prefer having the Buildah version bump in their own PR, then any cherry picks in a separate. That way you can more easily find the cherrypick PR in GitHub's PR list.

@rhatdan rhatdan changed the title Release 1.19.3 Pick default OCI Runtime from containers.conf Jan 25, 2021
@rhatdan rhatdan added the todo-backport-to-1.19 We should do or consider a backport to 1.19. Remove when we either decide not to, or open a PR. label Jan 25, 2021
@TomSweeneyRedHat
Copy link
Member

LGTM
@containers/build-maintainers another LGTM for the merge win please?

@rhatdan rhatdan added the lgtm label Jan 25, 2021
@openshift-merge-robot openshift-merge-robot merged commit 4ed72e6 into containers:release-1.19 Jan 25, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved lgtm locked - please file new issue/PR todo-backport-to-1.19 We should do or consider a backport to 1.19. Remove when we either decide not to, or open a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants