Skip to content

Commit 5092e0f

Browse files
authored
Merge pull request moby#4584 from tonistiigi/submount-errors
oci: fix error handling on submount calls
2 parents c1a9bdb + 42d866e commit 5092e0f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

executor/oci/spec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ func (s *submounts) subMount(m mount.Mount, subPath string) (mount.Mount, error)
233233
}
234234
h, err := hashstructure.Hash(m, hashstructure.FormatV2, nil)
235235
if err != nil {
236-
return mount.Mount{}, nil
236+
return mount.Mount{}, err
237237
}
238238
if mr, ok := s.m[h]; ok {
239239
sm, err := sub(mr.mount, subPath)
240240
if err != nil {
241-
return mount.Mount{}, nil
241+
return mount.Mount{}, err
242242
}
243243
return sm, nil
244244
}

0 commit comments

Comments
 (0)