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

Merge pull request #2249 from claudiubelu/fixes-missing-passwd-file

Browse Source 
Skips getting UID/GUID if passwd/group file is not found
This commit is contained in:
Tõnis Tiigi
2021-07-13 13:57:11 -07:00
committed by GitHub
parent 06e8602caa 449d010a72
commit d3cd28f59f
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
solver/llbsolver/file/user_linux.go
View File

@@ -2,6 +2,7 @@ package file
import (
"os"
"syscall"
"github.com/containerd/continuity/fs"
"github.com/moby/buildkit/snapshot"
@@ -45,6 +46,10 @@ func readUser(chopt *pb.ChownOpt, mu, mg fileoptypes.Mount) (*copy.User, error)
}
ufile, err := os.Open(passwdPath)
if errors.Is(err, os.ErrNotExist) || errors.Is(err, syscall.ENOTDIR) {
// Couldn't open the file. Considering this case as not finding the user in the file.
break
}
if err != nil {
return nil, err
}
@@ -95,6 +100,10 @@ func readUser(chopt *pb.ChownOpt, mu, mg fileoptypes.Mount) (*copy.User, error)
}
gfile, err := os.Open(groupPath)
if errors.Is(err, os.ErrNotExist) || errors.Is(err, syscall.ENOTDIR) {
// Couldn't open the file. Considering this case as not finding the group in the file.
break
}
if err != nil {
return nil, err
}