Differential D21570 Diff 79325 sysutils/docker-freebsd/files/patch-daemon_listeners_listeners__freebsd.go

Changeset View

Standalone View

sysutils/docker-freebsd/files/patch-daemon_listeners_listeners__freebsd.go

This file was added.

Property	Old Value	New Value
fbsd:nokeywords	null	yes \ No newline at end of property
svn:eol-style	null	native \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				--- daemon/listeners/listeners_freebsd.go.orig 2020-09-04 09:13:42 UTC
				+++ daemon/listeners/listeners_freebsd.go
				@@ -0,0 +1,107 @@
				+package listeners // import "github.com/docker/docker/daemon/listeners"
				+
				+import (
				+ "crypto/tls"
				+ "fmt"
				+ "net"
				+ "os"
				+ "strconv"
				+
				+ "github.com/coreos/go-systemd/activation"
				+ "github.com/docker/docker/pkg/homedir"
				+ "github.com/docker/go-connections/sockets"
				+ "github.com/sirupsen/logrus"
				+)
				+
				+// Init creates new listeners for the server.
				+// TODO: Clean up the fact that socketGroup and tlsConfig aren't always used.
				+func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listener, error) {
				+ ls := []net.Listener{}
				+
				+ switch proto {
				+ case "fd":
				+ fds, err := listenFD(addr, tlsConfig)
				+ if err != nil {
				+ return nil, err
				+ }
				+ ls = append(ls, fds...)
				+ case "tcp":
				+ l, err := sockets.NewTCPSocket(addr, tlsConfig)
				+ if err != nil {
				+ return nil, err
				+ }
				+ ls = append(ls, l)
				+ case "unix":
				+ gid, err := lookupGID(socketGroup)
				+ if err != nil {
				+ if socketGroup != "" {
				+ if socketGroup != defaultSocketGroup {
				+ return nil, err
				+ }
				+ logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err)
				+ }
				+ gid = os.Getgid()
				+ }
				+ l, err := sockets.NewUnixSocket(addr, gid)
				+ if err != nil {
				+ return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)
				+ }
				+ if _, err := homedir.StickRuntimeDirContents([]string{addr}); err != nil {
				+ // StickRuntimeDirContents returns nil error if XDG_RUNTIME_DIR is just unset
				+ logrus.WithError(err).Warnf("cannot set sticky bit on socket %s under XDG_RUNTIME_DIR", addr)
				+ }
				+ ls = append(ls, l)
				+ default:
				+ return nil, fmt.Errorf("invalid protocol format: %q", proto)
				+ }
				+
				+ return ls, nil
				+}
				+
				+// listenFD returns the specified socket activated files as a slice of
				+// net.Listeners or all of the activated files if "*" is given.
				+func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
				+ var (
				+ err error
				+ listeners []net.Listener
				+ )
				+ // socket activation
				+ if tlsConfig != nil {
				+ listeners, err = activation.TLSListeners(tlsConfig)
				+ } else {
				+ listeners, err = activation.Listeners()
				+ }
				+ if err != nil {
				+ return nil, err
				+ }
				+
				+ if len(listeners) == 0 {
				+ return nil, fmt.Errorf("no sockets found via socket activation: make sure the service was started by systemd")
				+ }
				+
				+ // default to all fds just like unix:// and tcp://
				+ if addr == "" \|\| addr == "*" {
				+ return listeners, nil
				+ }
				+
				+ fdNum, err := strconv.Atoi(addr)
				+ if err != nil {
				+ return nil, fmt.Errorf("failed to parse systemd fd address: should be a number: %v", addr)
				+ }
				+ fdOffset := fdNum - 3
				+ if len(listeners) < fdOffset+1 {
				+ return nil, fmt.Errorf("too few socket activated files passed in by systemd")
				+ }
				+ if listeners[fdOffset] == nil {
				+ return nil, fmt.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3)
				+ }
				+ for i, ls := range listeners {
				+ if i == fdOffset \|\| ls == nil {
				+ continue
				+ }
				+ if err := ls.Close(); err != nil {
				+ return nil, fmt.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)
				+ }
				+ }
				+ return []net.Listener{listeners[fdOffset]}, nil
				+}