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

Merge pull request #327 from Random-Liu/fix-image-volume

Browse Source 
Skip not exist image volume directory.
This commit is contained in:
Lantao Liu 2017-10-04 16:22:06 -07:00 committed by GitHub
commit d25c632bfe
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/opts/container.go
View File

@ -57,7 +57,15 @@ func WithVolumes(volumeMounts map[string]string) containerd.NewContainerOpts {
defer unix.Unmount(root, 0) // nolint: errcheck defer unix.Unmount(root, 0) // nolint: errcheck
for host, volume := range volumeMounts { for host, volume := range volumeMounts {
if err := copyExistingContents(filepath.Join(root, volume), host); err != nil { src := filepath.Join(root, volume)
if _, err := os.Stat(src); err != nil {
if os.IsNotExist(err) {
// Skip copying directory if it does not exist.
continue
}
return errors.Wrap(err, "stat volume in rootfs")
}
if err := copyExistingContents(src, host); err != nil {
return errors.Wrap(err, "taking runtime copy of volume") return errors.Wrap(err, "taking runtime copy of volume")
} }
} }