From e10baba32673d4b6d9ada129941428fc8f8304eb Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 11 Jan 2019 13:59:16 -0600 Subject: 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 --- pkg/varlinkapi/containers_create.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkg/varlinkapi') 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()) } -- cgit v1.2.3-54-g00ecf