From ca7c2cba6359e9f82b3fccd269dee86a9133bf28 Mon Sep 17 00:00:00 2001 From: Arthur Sengileyev Date: Sun, 24 Sep 2023 09:36:52 +0300 Subject: [PATCH] Update Podman --- .github/workflows/prepare-podman-release.yml | 2 +- ...-Unix-domain-socket-support-for-VLAN.patch | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/prepare-podman-release.yml b/.github/workflows/prepare-podman-release.yml index f8057ba..aac45d5 100644 --- a/.github/workflows/prepare-podman-release.yml +++ b/.github/workflows/prepare-podman-release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch env: PODMAN_GITURL: https://github.com/containers/podman.git - PODMAN_SHA: 5a3a9ce9c78ae037801d47b39c8f162fd781a046 + PODMAN_SHA: c3ab75ca459dc52661197c3dd42520bbd3317479 jobs: diff --git a/patches/podman/0002-Implement-Unix-domain-socket-support-for-VLAN.patch b/patches/podman/0002-Implement-Unix-domain-socket-support-for-VLAN.patch index 3123207..de881da 100644 --- a/patches/podman/0002-Implement-Unix-domain-socket-support-for-VLAN.patch +++ b/patches/podman/0002-Implement-Unix-domain-socket-support-for-VLAN.patch @@ -1,4 +1,4 @@ -From 465800edc7739aa6ec3e447ec366d4fbbe4c8b91 Mon Sep 17 00:00:00 2001 +From 30e7c2796af55536c63637a34df2031870fa0cdd Mon Sep 17 00:00:00 2001 From: Arthur Sengileyev Date: Mon, 31 Jul 2023 10:28:47 +0300 Subject: [PATCH 2/3] Implement Unix domain socket support for VLAN @@ -20,12 +20,12 @@ Signed-off-by: Arthur Sengileyev --- pkg/machine/machine_windows.go | 11 ++ pkg/machine/qemu/config.go | 26 +++- - pkg/machine/qemu/machine.go | 198 +++++++++++++++++----------- - pkg/machine/qemu/machine_unix.go | 52 +++++--- + pkg/machine/qemu/machine.go | 202 +++++++++++++++++----------- + pkg/machine/qemu/machine_unix.go | 52 ++++--- pkg/machine/qemu/machine_windows.go | 58 ++++++-- pkg/machine/wsl/machine.go | 2 +- pkg/machine/wsl/util_windows.go | 7 - - 7 files changed, 238 insertions(+), 116 deletions(-) + 7 files changed, 241 insertions(+), 117 deletions(-) diff --git a/pkg/machine/machine_windows.go b/pkg/machine/machine_windows.go index 237264448..5aea8c33d 100644 @@ -108,7 +108,7 @@ index 632848bd0..90c1cb48c 100644 } diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go -index 5b1045823..5c9537e19 100644 +index 5b1045823..8ea1bfa2d 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -42,6 +42,7 @@ const ( @@ -436,9 +436,14 @@ index 5b1045823..5c9537e19 100644 cmd.PidFile = v.PidFilePath.GetPath() cmd.SSHPort = v.Port -@@ -1344,9 +1377,9 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e +@@ -1342,11 +1375,13 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e + } + c := cmd.Cmd(binary) - c.ExtraFiles = []*os.File{dnr, dnw, dnw} +- c.ExtraFiles = []*os.File{dnr, dnw, dnw} ++ c.Stdin = dnr ++ c.Stdout = dnw ++ c.Stderr = dnw if err := c.Start(); err != nil { - return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err) + return "", 0, nil, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err) @@ -448,7 +453,7 @@ index 5b1045823..5c9537e19 100644 } func (v *MachineVM) setupAPIForwarding(cmd gvproxy.GvproxyCommand) (gvproxy.GvproxyCommand, string, machine.APIForwardingState) { -@@ -1364,10 +1397,10 @@ func (v *MachineVM) setupAPIForwarding(cmd gvproxy.GvproxyCommand) (gvproxy.Gvpr +@@ -1364,10 +1399,10 @@ func (v *MachineVM) setupAPIForwarding(cmd gvproxy.GvproxyCommand) (gvproxy.Gvpr forwardUser = "root" } @@ -463,7 +468,7 @@ index 5b1045823..5c9537e19 100644 // The linking pattern is /var/run/docker.sock -> user global sock (link) -> machine sock (socket) // This allows the helper to only have to maintain one constant target to the user, which can be -@@ -1577,6 +1610,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) { +@@ -1577,6 +1612,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) { return nil, err } connInfo.PodmanSocket = podmanSocket @@ -471,7 +476,7 @@ index 5b1045823..5c9537e19 100644 return &machine.InspectInfo{ ConfigPath: v.ConfigPath, ConnectionInfo: *connInfo, -@@ -1643,6 +1677,18 @@ func (v *MachineVM) editCmdLine(flag string, value string) { +@@ -1643,6 +1679,18 @@ func (v *MachineVM) editCmdLine(flag string, value string) { } }