Commit 8b031cac authored by zowoq's avatar zowoq
Browse files

podman: 4.3.1 -> 4.4.0 

https://github.com/containers/podman/releases/tag/v4.4.0
parent b1e8f506

nixos/tests/podman/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ import ../make-test-python.nix ( 
          docker.succeed(su_cmd("docker version"))



      with subtest("Run container via docker cli"):

          docker.succeed("docker network create default")

          docker.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

          docker.succeed(

            "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
@@ -158,7 +157,6 @@ import ../make-test-python.nix ( 
          docker.succeed("podman ps | grep sleeping")

          docker.succeed("docker stop sleeping")

          docker.succeed("docker rm sleeping")

          docker.succeed("docker network rm default")



      with subtest("A podman non-member can not use the docker cli"):

          docker.fail(su_cmd("docker version", user="mallory"))

nixos/tests/podman/tls-ghostunnel.nix

+0 −3
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ import ../make-test-python.nix ( 
      podman.wait_for_unit("sockets.target")

      podman.wait_for_unit("ghostunnel-server-podman-socket.service")



      with subtest("Create default network"):

          podman.succeed("docker network create default")



      with subtest("Root docker cli also works"):

          podman.succeed("docker version")

pkgs/applications/virtualization/podman/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 


buildGoModule rec {

  pname = "podman";

  version = "4.3.1";

  version = "4.4.0";



  src = fetchFromGitHub {

    owner = "containers";

    repo = "podman";

    rev = "v${version}";

    sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY=";

    sha256 = "sha256-kyeON8S7CCVdHt09wigNXDWScgyaLzC4EhOts8ViP2w=";

  };



  patches = [

pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch

+13 −13
Original line number Diff line number Diff line 
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go

index a6907c0df..717d82ff3 100644

index 4f25b4d26..8a79862fd 100644

--- a/pkg/machine/qemu/machine.go

+++ b/pkg/machine/qemu/machine.go

@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward

@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward

 			case 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. ")