containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update hooks to use config bool to detect volume mounts 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #700
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-04-30 11:58:02 -04:00 committed by Atomic Bot
parent 7137ca81d9
commit 1ece5d3db7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container_internal.go
View File

@ -1125,6 +1125,7 @@ func (c *Container) saveSpec(spec *spec.Spec) error {
return nil return nil
} }
// Add OCI hooks to a container's spec
func (c *Container) setupOCIHooks(g *generate.Generator) error { func (c *Container) setupOCIHooks(g *generate.Generator) error {
addedHooks := map[string]struct{}{} addedHooks := map[string]struct{}{}
ocihooks, err := hooks.SetupHooks(c.runtime.config.HooksDir) ocihooks, err := hooks.SetupHooks(c.runtime.config.HooksDir)
@ -1143,7 +1144,7 @@ func (c *Container) setupOCIHooks(g *generate.Generator) error {
} }
for _, hook := range ocihooks { for _, hook := range ocihooks {
logrus.Debugf("SetupOCIHooks", hook) logrus.Debugf("SetupOCIHooks", hook)
if hook.HasBindMounts && len(c.config.Spec.Mounts) > 0 { if hook.HasBindMounts && c.config.UserVolumes {
if err := addHook(hook); err != nil { if err := addHook(hook); err != nil {
return err return err
} }