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

Backports for Podman 3.3.2 #767

Merged
merged 3 commits into from Sep 14, 2021

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Sep 14, 2021

#759 Fix the fallback runtime path
66fee59

#754 Switch default Rootless Networking to "CNI" for OSX
854253d

#752 libimage: disk usage: catch corrupted images
ade9985

vrothberg and others added 3 commits September 14, 2021 12:17
Make sure to check an image for corruption before running disk usage on
it.  Such checks are already applied on various execution paths but not
yet on disk usage.

Further update the corrupted-image error to include that the image
should be removed to resolve the error.  This should ultimately guide
users to resolve the issue.

Fixes: containers#751
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This should better support rootless CNI usescases.

Fixes containers/podman#11396

Signed-off-by: Matthew Heon <mheon@redhat.com>
Podman should not use `/tmp/run-...`. The Podman PR#8241 changed the
path to `/tmp/podman-run-...` and added systemd tmpfile config to make
sure the path is not removed. However the tmpDir is set in c/common and
was never changed.

Fixes containers/podman#11478

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 14, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

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 Author

Luap99 commented Sep 14, 2021

@rhatdan @mheon PTAL

@mheon
Copy link
Member

mheon commented Sep 14, 2021

LGTM

@rhatdan
Copy link
Member

rhatdan commented Sep 14, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 14, 2021
@openshift-merge-robot openshift-merge-robot merged commit a9043ac into containers:v0.42 Sep 14, 2021
@Luap99 Luap99 deleted the podman-3.3.2 branch September 14, 2021 13:24
@Luap99
Copy link
Member Author

Luap99 commented Sep 14, 2021

@rhatdan Can you cut a new v0.42.2 for podman 3.3.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants