diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-16 12:44:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 12:44:10 +0100 |
| commit | d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0 (patch) | |
| tree | d0546c3da5d6aad67d3543cb4d6fc4faa6620735 /libpod/runtime_ctr.go | |
| parent | b3abe2c28941143d520e03c581b0ee3c3fafc087 (diff) | |
| parent | 3b37101c6e3679399a5ed05bb2e109df0e0032e8 (diff) | |
| download | podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.gz podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.bz2 podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.zip | |
Merge pull request #2079 from giuseppe/multiple-runtimes
oci: allow to define multiple OCI runtimes
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index ab79fe5fb..68599fe6d 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -62,6 +62,8 @@ func (r *Runtime) newContainer(ctx context.Context, rSpec *spec.Spec, options .. ctr.config.StopTimeout = CtrRemoveTimeout + ctr.config.OCIRuntime = r.config.OCIRuntime + // Set namespace based on current runtime namespace // Do so before options run so they can override it if r.config.Namespace != "" { |