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

Mention containers.conf settings for podman machine commands #24242

Merged
merged 1 commit into from
Oct 15, 2024

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Oct 11, 2024

Does this PR introduce a user-facing change?

containers.conf is now mentioned in podman machine man pages.

Copy link
Contributor

openshift-ci bot commented Oct 11, 2024

[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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2024
@@ -52,6 +52,8 @@ Fedora CoreOS upgrades come out every 14 days and are detected and installed aut
For more information on updates and advanced configuration,
see the Fedora CoreOS documentation about [auto-updates](https://docs.fedoraproject.org/en-US/fedora-coreos/auto-updates/) and [update strategies](https://coreos.github.io/zincati/usage/updates-strategy/).

Default podman machines settings can set via the [machine] section in the containers.conf(5) file.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Default podman machines settings can set via the [machine] section in the containers.conf(5) file.
Default podman machines settings can be set via the [machine] section in the containers.conf(5) file.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Copy link

Cockpit tests failed for commit 3a4c446. @martinpitt, @jelly, @mvollmer please check.

@mheon
Copy link
Member

mheon commented Oct 14, 2024

LGTM

@martinpitt
Copy link
Contributor

cockpit f41 test failure is the same "occasional criu failure" than in #24238 (comment) . It ran before the improved debugging cockpit-project/cockpit-podman#1878 , so this is useless, and can be ignored or retried here. I.e. all good from our side.

@baude
Copy link
Member

baude commented Oct 15, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 15, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 40dae5e into containers:main Oct 15, 2024
38 of 39 checks passed
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Jan 14, 2025
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Jan 14, 2025
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.

5 participants