diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2017-12-18 12:05:06 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-03 12:38:18 +0000 |
commit | 00d38cb37958f3c636aa5837b8f01dfad891a0b5 (patch) | |
tree | e0eb9039266a725f5315ac05f3909f7a6a4a309e /libpod/runtime_ctr.go | |
parent | 8aeb38e4a718925a78606b8aa014bce6b4a4054c (diff) | |
download | podman-00d38cb37958f3c636aa5837b8f01dfad891a0b5.tar.gz podman-00d38cb37958f3c636aa5837b8f01dfad891a0b5.tar.bz2 podman-00d38cb37958f3c636aa5837b8f01dfad891a0b5.zip |
podman create/run need to load information from the image
We should be pulling information out of the image to set the
defaults to use when setting up the container.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #110
Approved by: mheon
Diffstat (limited to 'libpod/runtime_ctr.go')
-rw-r--r-- | libpod/runtime_ctr.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 1f2b8945e..9e42ff8d1 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -25,14 +25,14 @@ type CtrCreateOption func(*Container) error type ContainerFilter func(*Container) bool // NewContainer creates a new container from a given OCI config -func (r *Runtime) NewContainer(spec *spec.Spec, options ...CtrCreateOption) (c *Container, err error) { +func (r *Runtime) NewContainer(rSpec *spec.Spec, options ...CtrCreateOption) (c *Container, err error) { r.lock.Lock() defer r.lock.Unlock() if !r.valid { return nil, ErrRuntimeStopped } - ctr, err := newContainer(spec, r.lockDir) + ctr, err := newContainer(rSpec, r.lockDir) if err != nil { return nil, err } |