github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1429 from dmcgowan/client-use-root-path

Browse Source 
Use RootPath for resolving path inside of an image
This commit is contained in:
Michael Crosby 2017-08-25 16:23:28 -04:00 committed by GitHub
commit 360e46ddda
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spec_opts_unix.go
View File

@ -16,6 +16,7 @@ import (
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/fs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
@ -322,7 +323,11 @@ func WithUserID(uid uint32) SpecOpts {
} }
} }
defer unix.Unmount(root, 0) defer unix.Unmount(root, 0)
f, err := os.Open(filepath.Join(root, "/etc/passwd")) ppath, err := fs.RootPath(root, "/etc/passwd")
if err != nil {
return err
}
f, err := os.Open(ppath)
if err != nil { if err != nil {
return err return err
} }
@ -370,7 +375,11 @@ func WithUsername(username string) SpecOpts {
} }
} }
defer unix.Unmount(root, 0) defer unix.Unmount(root, 0)
f, err := os.Open(filepath.Join(root, "/etc/passwd")) ppath, err := fs.RootPath(root, "/etc/passwd")
if err != nil {
return err
}
f, err := os.Open(ppath)
if err != nil { if err != nil {
return err return err
} }