-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
podman: 4.9.3 -> 5.0.1 #301553
Merged
SuperSandro2000
merged 1 commit into
NixOS:master
from
the-sun-will-rise-tomorrow:podman-5
Apr 17, 2024
Merged
podman: 4.9.3 -> 5.0.1 #301553
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
pkgs/applications/virtualization/podman/hardcode-paths.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go | ||
| index 19c4bb6bf..2743de4b2 100644 | ||
| --- a/vendor/github.com/containers/common/pkg/config/default.go | ||
| +++ b/vendor/github.com/containers/common/pkg/config/default.go | ||
| @@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) { | ||
| c.Retry = 3 | ||
| c.OCIRuntimes = map[string][]string{ | ||
| "crun": { | ||
| - "/usr/bin/crun", | ||
| - "/usr/sbin/crun", | ||
| - "/usr/local/bin/crun", | ||
| - "/usr/local/sbin/crun", | ||
| - "/sbin/crun", | ||
| - "/bin/crun", | ||
| - "/run/current-system/sw/bin/crun", | ||
| + "@crun@/bin/crun", | ||
| }, | ||
| "crun-vm": { | ||
| - "/usr/bin/crun-vm", | ||
| - "/usr/local/bin/crun-vm", | ||
| - "/usr/local/sbin/crun-vm", | ||
| - "/sbin/crun-vm", | ||
| - "/bin/crun-vm", | ||
| - "/run/current-system/sw/bin/crun-vm", | ||
| + // TODO: "@crun-vm@/bin/crun-vm", | ||
| }, | ||
| "crun-wasm": { | ||
| - "/usr/bin/crun-wasm", | ||
| - "/usr/sbin/crun-wasm", | ||
| - "/usr/local/bin/crun-wasm", | ||
| - "/usr/local/sbin/crun-wasm", | ||
| - "/sbin/crun-wasm", | ||
| - "/bin/crun-wasm", | ||
| - "/run/current-system/sw/bin/crun-wasm", | ||
| + // TODO: "@crun-wasm@/bin/crun-wasm", | ||
| }, | ||
| "runc": { | ||
| - "/usr/bin/runc", | ||
| - "/usr/sbin/runc", | ||
| - "/usr/local/bin/runc", | ||
| - "/usr/local/sbin/runc", | ||
| - "/sbin/runc", | ||
| - "/bin/runc", | ||
| - "/usr/lib/cri-o-runc/sbin/runc", | ||
| - "/run/current-system/sw/bin/runc", | ||
| + "@runc@/bin/runc", | ||
| }, | ||
| "runj": { | ||
| - "/usr/local/bin/runj", | ||
| + // TODO: "@runj@/bin/runj", | ||
| }, | ||
| "kata": { | ||
| - "/usr/bin/kata-runtime", | ||
| - "/usr/sbin/kata-runtime", | ||
| - "/usr/local/bin/kata-runtime", | ||
| - "/usr/local/sbin/kata-runtime", | ||
| - "/sbin/kata-runtime", | ||
| - "/bin/kata-runtime", | ||
| - "/usr/bin/kata-qemu", | ||
| - "/usr/bin/kata-fc", | ||
| + // TODO: "@kata@/bin/kata", | ||
| }, | ||
| "runsc": { | ||
| - "/usr/bin/runsc", | ||
| - "/usr/sbin/runsc", | ||
| - "/usr/local/bin/runsc", | ||
| - "/usr/local/sbin/runsc", | ||
| - "/bin/runsc", | ||
| - "/sbin/runsc", | ||
| - "/run/current-system/sw/bin/runsc", | ||
| + "@gvisor@/bin/runsc", | ||
| }, | ||
| "youki": { | ||
| - "/usr/local/bin/youki", | ||
| - "/usr/bin/youki", | ||
| - "/bin/youki", | ||
| - "/run/current-system/sw/bin/youki", | ||
| + "@youki@/bin/youki", | ||
SuperSandro2000 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| "krun": { | ||
| - "/usr/bin/krun", | ||
| - "/usr/local/bin/krun", | ||
| + // TODO: "@krun@/bin/krun", | ||
| }, | ||
| "ocijail": { | ||
| - "/usr/local/bin/ocijail", | ||
| + // TODO: "@ocijail@/bin/ocijail", | ||
| }, | ||
| } | ||
| c.PlatformToOCIRuntime = map[string]string{ | ||
| @@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) { | ||
| // Needs to be called after populating c.OCIRuntimes. | ||
| c.OCIRuntime = c.findRuntime() | ||
|
|
||
| - c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"}) | ||
| + c.ConmonEnvVars.Set([]string{}) | ||
| c.ConmonPath.Set([]string{ | ||
| - "/usr/libexec/podman/conmon", | ||
| - "/usr/local/libexec/podman/conmon", | ||
| - "/usr/local/lib/podman/conmon", | ||
| - "/usr/bin/conmon", | ||
| - "/usr/sbin/conmon", | ||
| - "/usr/local/bin/conmon", | ||
| - "/usr/local/sbin/conmon", | ||
| - "/run/current-system/sw/bin/conmon", | ||
| + "@conmon@/bin/conmon", | ||
| }) | ||
| c.ConmonRsPath.Set([]string{ | ||
| "/usr/libexec/podman/conmonrs", | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should try to limit this to what is useful. I thin kcrun is in almost every case better than runc, so we can drop that.
see https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/building_running_and_managing_containers/selecting-a-container-runtime_building-running-and-managing-containers#con_the-crun-container-runtime_selecting-a-container-runtime
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would we want to limit this - to reduce the number of dependencies?
But, if
runcis obsolete, why would upstream still continue supporting it?Since upstream continues supporting it, wouldn't that imply that it is valuable to have it as an option?
Also, if we don't want to support
runc, shouldn't we delete it from nixpkgs?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, we increased the dependencies with this update a lot.
Maybe there are certain usecases when it is useful which are not relevant to nixpkgs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to make these dependencies (
runc,gvisor,youki) optional?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I think so. I think we could right now overwrite them with null, but that is a bit dirty.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#310182 does this. I left
runcin by default on Linux, because nixpkgs actually has a test that podman works with that runtime. But, it can now be disabled.