diff options
| author | baude <bbaude@redhat.com> | 2019-01-11 13:59:16 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-01-11 14:01:57 -0600 |
| commit | e10baba32673d4b6d9ada129941428fc8f8304eb (patch) | |
| tree | 27c75727f7233e842b88d901903a316c18f11150 /pkg/varlinkapi | |
| parent | 28c35cab8750f379a418e87ed6bd874a12ec158d (diff) | |
| download | podman-e10baba32673d4b6d9ada129941428fc8f8304eb.tar.gz podman-e10baba32673d4b6d9ada129941428fc8f8304eb.tar.bz2 podman-e10baba32673d4b6d9ada129941428fc8f8304eb.zip | |
podman play kube: add containers to pod
when defining containers, we missed the conditional logic to allow
the container to be defined with "WithPod" and so forth. I had to
slightly modify the createcontainer process to pass a libpod.Pod
that could override things; use nil as no pod.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/varlinkapi')
| -rw-r--r-- | pkg/varlinkapi/containers_create.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index 63bc93686..d72eaeb18 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -41,7 +41,9 @@ func (i *LibpodAPI) CreateContainer(call iopodman.VarlinkCall, config iopodman.C return call.ReplyErrorOccurred(err.Error()) } - options, err := createConfig.GetContainerCreateOptions(i.Runtime) + // TODO fix when doing remote client and dealing with the ability to create a container + // within a non-existing pod (i.e. --pod new:foobar) + options, err := createConfig.GetContainerCreateOptions(i.Runtime, nil) if err != nil { return call.ReplyErrorOccurred(err.Error()) } |