podman: 4.5.1 -> 4.6.0
Diff: https://github.com/containers/podman/compare/v4.5.1...v4.6.0 Changelog: https://github.com/containers/podman/blob/v4.6.0/RELEASE_NOTES.md
This commit is contained in:
parent
7687b8464f
commit
9ae366f179
|
@ -40,7 +40,6 @@ let
|
|||
runc
|
||||
crun
|
||||
conmon
|
||||
slirp4netns
|
||||
fuse-overlayfs
|
||||
util-linux
|
||||
iptables
|
||||
|
@ -57,18 +56,19 @@ let
|
|||
aardvark-dns
|
||||
catatonit # added here for the pause image and also set in `containersConf` for `init_path`
|
||||
netavark
|
||||
slirp4netns
|
||||
];
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PG2/iMsr/shLqhuYSvhT1I1kPDh0g0ebnGUHHzA7u5A=";
|
||||
hash = "sha256-8cfEZBYhR5CWkHEpIZ0j011gyV6lnY7z4KgJPJr0MfQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
|
||||
index 4f25b4d26..8a79862fd 100644
|
||||
index a118285f7..d775f0099 100644
|
||||
--- a/pkg/machine/qemu/machine.go
|
||||
+++ b/pkg/machine/qemu/machine.go
|
||||
@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward
|
||||
case notInstalled:
|
||||
@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState,
|
||||
case machine.NotInstalled:
|
||||
fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n")
|
||||
fmt.Printf("address can't be used by podman. ")
|
||||
- if helper := findClaimHelper(); len(helper) > 0 {
|
||||
|
@ -11,6 +11,6 @@ index 4f25b4d26..8a79862fd 100644
|
|||
- fmt.Printf("\n\tsudo %s install\n", helper)
|
||||
- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix)
|
||||
- }
|
||||
case machineLocal:
|
||||
case machine.MachineLocal:
|
||||
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
|
||||
case claimUnsupported:
|
||||
case machine.ClaimUnsupported:
|
||||
|
|
Loading…
Reference in a new issue