docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert api/server.go to also use the handy user package 

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-02-25 13:07:19 -07:00
parent 56584a92f4
commit 7bce5957a0
1 changed files with 7 additions and 10 deletions
Show Stats 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/engine"
"github.com/dotcloud/docker/pkg/listenbuffer" "github.com/dotcloud/docker/pkg/listenbuffer"
"github.com/dotcloud/docker/pkg/systemd" "github.com/dotcloud/docker/pkg/systemd"
"github.com/dotcloud/docker/pkg/user"
"github.com/dotcloud/docker/utils" "github.com/dotcloud/docker/utils"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"io" "io"
@ -21,7 +22,6 @@ import (
"net/http" "net/http"
"net/http/pprof" "net/http/pprof"
"os" "os"
"regexp"
"strconv" "strconv"
"strings" "strings"
"syscall" "syscall"
@ -1142,18 +1142,15 @@ func ListenAndServe(proto, addr string, eng *engine.Engine, logging, enableCors
return err return err
} }
groups, err := ioutil.ReadFile("/etc/group") groups, err := user.ParseGroupFilter(func(g *user.Group) bool {
return g.Name == "docker"
})
if err != nil { if err != nil {
return err return err
} }
re := regexp.MustCompile("(^|\n)docker:.*?:([0-9]+)") if len(groups) > 0 {
if gidMatch := re.FindStringSubmatch(string(groups)); gidMatch != nil { utils.Debugf("docker group found. gid: %d", groups[0].Gid)
gid, err := strconv.Atoi(gidMatch[2]) if err := os.Chown(addr, 0, groups[0].Gid); err != nil {
if err != nil {
return err
}
utils.Debugf("docker group found. gid: %d", gid)
if err := os.Chown(addr, 0, gid); err != nil {
return err return err
} }
} }