mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix graph/tags_unit_test.go on FreeBSD
- Directories should have u+x (0600 -> 0700) - Don't chown files to root because we don't have to Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
This commit is contained in:
parent
19c8e74fd3
commit
5ebe86ccf9
2 changed files with 9 additions and 3 deletions
|
@ -61,7 +61,7 @@ func ApplyLayer(dest string, layer ArchiveReader) error {
|
|||
parent := filepath.Dir(hdr.Name)
|
||||
parentPath := filepath.Join(dest, parent)
|
||||
if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
|
||||
err = os.MkdirAll(parentPath, 0600)
|
||||
err = os.MkdirAll(parentPath, 0700)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -19,11 +19,19 @@ const (
|
|||
)
|
||||
|
||||
func fakeTar() (io.Reader, error) {
|
||||
uid := os.Getuid()
|
||||
gid := os.Getgid()
|
||||
|
||||
content := []byte("Hello world!\n")
|
||||
buf := new(bytes.Buffer)
|
||||
tw := tar.NewWriter(buf)
|
||||
for _, name := range []string{"/etc/postgres/postgres.conf", "/etc/passwd", "/var/log/postgres/postgres.conf"} {
|
||||
hdr := new(tar.Header)
|
||||
|
||||
// Leaving these fields blank requires root privileges
|
||||
hdr.Uid = uid
|
||||
hdr.Gid = gid
|
||||
|
||||
hdr.Size = int64(len(content))
|
||||
hdr.Name = name
|
||||
if err := tw.WriteHeader(hdr); err != nil {
|
||||
|
@ -53,8 +61,6 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
|
|||
t.Fatal(err)
|
||||
}
|
||||
img := &image.Image{ID: testImageID}
|
||||
// FIXME: this fails on Darwin with:
|
||||
// tags_unit_test.go:36: mkdir /var/folders/7g/b3ydb5gx4t94ndr_cljffbt80000gq/T/docker-test569b-tRunner-075013689/vfs/dir/foo/etc/postgres: permission denied
|
||||
if err := graph.Register(nil, archive, img); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue