diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_commit.go | 5 | ||||
| -rw-r--r-- | libpod/runtime.go | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 8cb04ec1a..2872012b8 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -24,6 +24,9 @@ type ContainerCommitOptions struct { Changes []string } +// ChangeCmds is the list of valid Changes commands to passed to the Commit call +var ChangeCmds = []string{"CMD", "ENTRYPOINT", "ENV", "EXPOSE", "LABEL", "ONBUILD", "STOPSIGNAL", "USER", "VOLUME", "WORKDIR"} + // Commit commits the changes between a container and its image, creating a new // image func (c *Container) Commit(ctx context.Context, destImage string, options ContainerCommitOptions) (*image.Image, error) { @@ -138,6 +141,8 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai isLabelCleared = true } importBuilder.SetLabel(splitChange[1], splitChange[2]) + case "ONBUILD": + importBuilder.SetOnBuild(splitChange[1]) case "STOPSIGNAL": // No Set StopSignal case "USER": diff --git a/libpod/runtime.go b/libpod/runtime.go index 52a2653b3..b208bc718 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -151,6 +151,7 @@ var ( "/usr/lib/cri-o-runc/sbin/runc", }, ConmonPath: []string{ + "/usr/libexec/podman/conmon", "/usr/libexec/crio/conmon", "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", |