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

Add UID/GID map arguments to MakeStore() 

The store needs to be able to have UID/GID maps passed to it at
initialization-time.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2016-09-06 17:21:25 -04:00
parent 4bfe98a892
commit a6f7a6fe7b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/oci-storage/main.go
View File

@ -124,7 +124,7 @@ func main() {
} else {
logrus.SetLevel(logrus.ErrorLevel)
}
store, err := storage.MakeStore(runRoot, graphRoot, graphDriver, graphOptions)
store, err := storage.MakeStore(runRoot, graphRoot, graphDriver, graphOptions, nil, nil)
if err != nil {
fmt.Printf("error initializing: %v\n", err)
os.Exit(1)

18
storage/store.go
View File

@ -13,6 +13,7 @@ import (
drivers "github.com/containers/storage/drivers"
"github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/stringid"
"github.com/containers/storage/storageversion"
)
@ -272,6 +273,8 @@ type store struct {
graphRoot string
graphDriverName string
graphOptions []string
uidMap []idtools.IDMap
gidMap []idtools.IDMap
loaded bool
graphDriver drivers.Driver
layerStore LayerStore
@ -281,7 +284,7 @@ type store struct {
// MakeStore creates and initializes a new Store object, and the underlying
// storage that it controls.
func MakeStore(runRoot, graphRoot, graphDriverName string, graphOptions []string) (Mall, error) {
func MakeStore(runRoot, graphRoot, graphDriverName string, graphOptions []string, uidMap, gidMap []idtools.IDMap) (Mall, error) {
if runRoot == "" && graphRoot == "" && graphDriverName == "" && len(graphOptions) == 0 {
runRoot = "/var/run/oci-storage"
graphRoot = "/var/lib/oci-storage"
@ -317,6 +320,8 @@ func MakeStore(runRoot, graphRoot, graphDriverName string, graphOptions []string
graphRoot: graphRoot,
graphDriverName: graphDriverName,
graphOptions: graphOptions,
uidMap: copyIDMap(uidMap),
gidMap: copyIDMap(gidMap),
}
if err := s.load(); err != nil {
return nil, err
@ -324,6 +329,15 @@ func MakeStore(runRoot, graphRoot, graphDriverName string, graphOptions []string
return s, nil
}
func copyIDMap(idmap []idtools.IDMap) []idtools.IDMap {
m := []idtools.IDMap{}
if idmap != nil {
m = make([]idtools.IDMap, len(idmap))
copy(m, idmap)
}
return m[:]
}
func (s *store) GetRunRoot() string {
return s.runRoot
}
@ -1808,5 +1822,5 @@ nextLayer:
// MakeMall was the old name of MakeStore. It will be dropped at some point.
func MakeMall(runRoot, graphRoot, graphDriverName string, graphOptions []string) (Mall, error) {
return MakeStore(runRoot, graphRoot, graphDriverName, graphOptions)
return MakeStore(runRoot, graphRoot, graphDriverName, graphOptions, nil, nil)
}