diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_commit.go | 3 | ||||
| -rw-r--r-- | libpod/container_internal.go | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 17586bfad..8dfeee9b8 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -19,7 +19,7 @@ import ( // ContainerCommitOptions is a struct used to commit a container to an image // It uses buildah's CommitOptions as a base. Long-term we might wish to // add these to the buildah struct once buildah is more integrated with -//libpod +// libpod type ContainerCommitOptions struct { buildah.CommitOptions Pause bool @@ -177,6 +177,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai return nil, errors.Errorf("invalid env variable %q: not defined in your environment", name) } } else { + name = change[0] val = strings.Join(change[1:], " ") } if !isEnvCleared { // Multiple values are valid, only clear once. diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 36732685b..83ee5640e 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1474,10 +1474,6 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (exten } else { manager, err := hooks.New(ctx, c.runtime.config.HooksDir, []string{"precreate", "poststop"}) if err != nil { - if os.IsNotExist(err) { - logrus.Warnf("Requested OCI hooks directory %q does not exist", c.runtime.config.HooksDir) - return nil, nil - } return nil, err } |