dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-02 22:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4335 from tianon/what-the-etc-group

Browse Source 
Convert api/server.go to also use the handy user package
This commit is contained in:
Michael Crosby
2014-02-25 15:50:53 -05:00
parent 56584a92f4 7bce5957a0
commit 79089720c4
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/server.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/pkg/listenbuffer"
"github.com/dotcloud/docker/pkg/systemd"
"github.com/dotcloud/docker/pkg/user"
"github.com/dotcloud/docker/utils"
"github.com/gorilla/mux"
"io"
@@ -21,7 +22,6 @@ import (
"net/http"
"net/http/pprof"
"os"
"regexp"
"strconv"
"strings"
"syscall"
@@ -1142,18 +1142,15 @@ func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors
return err
}
groups, err := ioutil.ReadFile("/etc/group")
groups, err := user.ParseGroupFilter(func(g *user.Group) bool {
return g.Name == "docker"
})
if err != nil {
return err
}
re := regexp.MustCompile("(^|\n)docker:.*?:([0-9]+)")
if gidMatch := re.FindStringSubmatch(string(groups)); gidMatch != nil {
gid, err := strconv.Atoi(gidMatch[2])
if err != nil {
return err
}
utils.Debugf("docker group found. gid: %d", gid)
if err := os.Chown(addr, 0, gid); err != nil {
if len(groups) > 0 {
utils.Debugf("docker group found. gid: %d", groups[0].Gid)
if err := os.Chown(addr, 0, groups[0].Gid); err != nil {
return err
}
}