beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31833 from tonistiigi/docker-group

Browse source 
Fix default socket group regression
This commit is contained in:
Victor Vieux 2017-03-14 20:34:42 -07:00 committed by GitHub
commit 0b9b7906af
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/listeners/group_unix.go
View file

@ -10,6 +10,8 @@ import (
"github.com/pkg/errors"
)
const defaultSocketGroup = "docker"
func lookupGID(name string) (int, error) {
groupFile, err := user.GetGroupPath()
if err != nil {

8
pkg/listeners/listeners_solaris.go
View file

@ -4,7 +4,9 @@ import (
"crypto/tls"
"fmt"
"net"
"os"
"github.com/Sirupsen/logrus"
"github.com/docker/go-connections/sockets"
)
@ -20,7 +22,11 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) (ls []net.List
case "unix":
gid, err := lookupGID(socketGroup)
if err != nil {
return nil, err
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 {

8
pkg/listeners/listeners_unix.go
View file

@ -6,8 +6,10 @@ import (
"crypto/tls"
"fmt"
"net"
"os"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/activation"
"github.com/docker/go-connections/sockets"
)
@ -33,7 +35,11 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listene
case "unix":
gid, err := lookupGID(socketGroup)
if err != nil {
return nil, err
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 {