Merge pull request #258851 from cyrillzadra/bump-podman470
podman: 4.6.2 -> 4.7.0
This commit is contained in:
commit
32b8bd327c
|
@ -62,13 +62,13 @@ let
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "podman";
|
pname = "podman";
|
||||||
version = "4.6.2";
|
version = "4.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = "podman";
|
repo = "podman";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-Zxzb7ORyugvN9mhxa0s8r0ch16Ndbm3Z1JCsQcwbF6g=";
|
hash = "sha256-xbU2F/QYtTKeZacTmwKDfIGuUg9VStEO/jkpChK0DyU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -1,16 +1,19 @@
|
||||||
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
|
diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go
|
||||||
index a118285f7..d775f0099 100644
|
index 649748947..a981d93bf 100644
|
||||||
--- a/pkg/machine/qemu/machine.go
|
--- a/pkg/machine/machine_common.go
|
||||||
+++ b/pkg/machine/qemu/machine.go
|
+++ b/pkg/machine/machine_common.go
|
||||||
@@ -1560,11 +1560,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState machine.APIForwardingState,
|
@@ -127,14 +127,6 @@ address can't be used by podman. `
|
||||||
case machine.NotInstalled:
|
|
||||||
fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n")
|
if len(helper) < 1 {
|
||||||
fmt.Printf("address can't be used by podman. ")
|
fmt.Print(fmtString)
|
||||||
- if helper := findClaimHelper(); len(helper) > 0 {
|
- } else {
|
||||||
- fmt.Printf("If you would like to install it run the\nfollowing commands:\n")
|
- fmtString += `If you would like to install it run the\nfollowing commands:
|
||||||
- fmt.Printf("\n\tsudo %s install\n", helper)
|
-
|
||||||
- fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix)
|
- sudo %s install
|
||||||
- }
|
- podman machine stop%[1]s; podman machine start%[1]s
|
||||||
case machine.MachineLocal:
|
-
|
||||||
|
- `
|
||||||
|
- fmt.Printf(fmtString, helper, suffix)
|
||||||
|
}
|
||||||
|
case MachineLocal:
|
||||||
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
|
fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
|
||||||
case machine.ClaimUnsupported:
|
|
||||||
|
|
Loading…
Reference in a new issue