opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

config: store the runtime used to create each container

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-01-07 08:46:13 +01:00
parent 50c86ae389
commit 3b37101c6e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container.go
View File

@ -350,6 +350,9 @@ type ContainerConfig struct {
PostConfigureNetNS bool `json:"postConfigureNetNS"` PostConfigureNetNS bool `json:"postConfigureNetNS"`
// OCIRuntime used to create the container
OCIRuntime string `json:"runtime,omitempty"`
// ExitCommand is the container's exit command. // ExitCommand is the container's exit command.
// This Command will be executed when the container exits // This Command will be executed when the container exits
ExitCommand []string `json:"exitCommand,omitempty"` ExitCommand []string `json:"exitCommand,omitempty"`

2
libpod/runtime_ctr.go
View File

@ -62,6 +62,8 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options ..
ctr.config.StopTimeout = CtrRemoveTimeout ctr.config.StopTimeout = CtrRemoveTimeout
ctr.config.OCIRuntime = r.config.OCIRuntime
// Set namespace based on current runtime namespace // Set namespace based on current runtime namespace
// Do so before options run so they can override it // Do so before options run so they can override it
if r.config.Namespace != "" { if r.config.Namespace != "" {