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

Merge pull request #1504 from lorenz/ignore-image-defined-volumes

Browse Source 
Add option for ignoring volumes defined in images
This commit is contained in:
Mike Brown
2020-06-14 11:52:48 -05:00
committed by GitHub
parent 26dc5b9772 5a1d49b063
commit b661ad711e
5 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/container_create.go
View File

@@ -137,8 +137,13 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
}
}()
// Create container volumes mounts.
volumeMounts := c.volumeMounts(containerRootDir, config.GetMounts(), &image.ImageSpec.Config)
var volumeMounts []*runtime.Mount
if !c.config.IgnoreImageDefinedVolumes {
// Create container image volumes mounts.
volumeMounts = c.volumeMounts(containerRootDir, config.GetMounts(), &image.ImageSpec.Config)
} else if len(image.ImageSpec.Config.Volumes) != 0 {
log.G(ctx).Debugf("Ignoring volumes defined in image %v because IgnoreImageDefinedVolumes is set", image.ID)
}
// Generate container mounts.
mounts := c.containerMounts(sandboxID, config)