diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-09 02:32:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 02:32:52 -0800 |
| commit | 0a7373e802bbc56fa4574fca51005c576a7e04da (patch) | |
| tree | 490ce40fdae6b792135c3de93ee586314eedfae0 /libpod/container_internal_linux.go | |
| parent | c9d63fe89d0a79b069b56249aaa4c168b47649c0 (diff) | |
| parent | 99e642d9409aef2fadb21546444d3a6a92604124 (diff) | |
| download | podman-0a7373e802bbc56fa4574fca51005c576a7e04da.tar.gz podman-0a7373e802bbc56fa4574fca51005c576a7e04da.tar.bz2 podman-0a7373e802bbc56fa4574fca51005c576a7e04da.zip | |
Merge pull request #1830 from wking/config-filter-hooks
hooks: Add pre-create hooks for runtime-config manipulation
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 0745b7732..c66be1061 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -228,10 +228,6 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { } } - if c.state.ExtensionStageHooks, err = c.setupOCIHooks(ctx, g.Config); err != nil { - return nil, errors.Wrapf(err, "error setting up OCI Hooks") - } - // Bind builtin image volumes if c.config.Rootfs == "" && c.config.ImageVolumes { if err := c.addLocalVolumes(ctx, &g, execUser); err != nil { @@ -384,6 +380,12 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { logrus.Debugf("set root propagation to %q", rootPropagation) g.SetLinuxRootPropagation(rootPropagation) } + + // Warning: precreate hooks may alter g.Config in place. + if c.state.ExtensionStageHooks, err = c.setupOCIHooks(ctx, g.Config); err != nil { + return nil, errors.Wrapf(err, "error setting up OCI Hooks") + } + return g.Config, nil } |