From 4e0326241b35d2549fdba5666f343c31279e18e4 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Fri, 17 Apr 2020 16:27:17 -0700 Subject: V2 Fix support for tcp://[::] connections * Fix support for socket activation, on remote and service $ systemd-socket-activate -l 8083 --fdname=podman bin/podman system service --log-level=debug --time=30 $ bin/podman-remote --remote=tcp://[::]:8083 image ls Or, use the podman.{socket,service} unit files $ bin/podman-remote --remote=unix:///run/podman/podman.sock image ls Signed-off-by: Jhon Honce --- pkg/domain/infra/abi/system.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkg/domain/infra') diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 67593b2dd..078f5404d 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -35,7 +35,7 @@ func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) { func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceOptions) error { var ( - listener net.Listener + listener *net.Listener err error ) @@ -45,13 +45,14 @@ func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceO return errors.Errorf("%s is an invalid socket destination", opts.URI) } address := strings.Join(fields[1:], ":") - listener, err = net.Listen(fields[0], address) + l, err := net.Listen(fields[0], address) if err != nil { return errors.Wrapf(err, "unable to create socket %s", opts.URI) } + listener = &l } - server, err := api.NewServerWithSettings(ic.Libpod, opts.Timeout, &listener) + server, err := api.NewServerWithSettings(ic.Libpod, opts.Timeout, listener) if err != nil { return err } @@ -62,7 +63,9 @@ func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceO }() err = server.Serve() - _ = listener.Close() + if listener != nil { + _ = (*listener).Close() + } return err } -- cgit v1.2.3-54-g00ecf