diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 3 | ||||
| -rw-r--r-- | libpod/networking_machine.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 3cfe19517..c168b7eca 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -23,6 +23,7 @@ import ( "github.com/containers/common/libnetwork/etchosts" "github.com/containers/common/libnetwork/types" "github.com/containers/common/pkg/config" + "github.com/containers/common/pkg/machine" "github.com/containers/common/pkg/netns" "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/libpod/events" @@ -62,7 +63,7 @@ const ( // This is need because a HostIP of 127.0.0.1 would now allow the gvproxy forwarder to reach to open ports. // For machine the HostIP must only be used by gvproxy and never in the VM. func (c *Container) convertPortMappings() []types.PortMapping { - if !c.runtime.config.Engine.MachineEnabled || len(c.config.PortMappings) == 0 { + if !machine.IsPodmanMachine() || len(c.config.PortMappings) == 0 { return c.config.PortMappings } // if we run in a machine VM we have to ignore the host IP part diff --git a/libpod/networking_machine.go b/libpod/networking_machine.go index d2a6b7cfa..73089c474 100644 --- a/libpod/networking_machine.go +++ b/libpod/networking_machine.go @@ -14,6 +14,7 @@ import ( "time" "github.com/containers/common/libnetwork/types" + "github.com/containers/common/pkg/machine" "github.com/sirupsen/logrus" ) @@ -117,7 +118,7 @@ func annotateGvproxyResponseError(r io.Reader) error { // exposeMachinePorts exposes the ports for podman machine via gvproxy func (r *Runtime) exposeMachinePorts(ports []types.PortMapping) error { - if !r.config.Engine.MachineEnabled { + if !machine.IsGvProxyBased() { return nil } return requestMachinePorts(true, ports) @@ -125,7 +126,7 @@ func (r *Runtime) exposeMachinePorts(ports []types.PortMapping) error { // unexposeMachinePorts closes the ports for podman machine via gvproxy func (r *Runtime) unexposeMachinePorts(ports []types.PortMapping) error { - if !r.config.Engine.MachineEnabled { + if !machine.IsGvProxyBased() { return nil } return requestMachinePorts(false, ports) |