summaryrefslogtreecommitdiff
path: root/pkg/spec/containerconfig.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/spec/containerconfig.go')
-rw-r--r--pkg/spec/containerconfig.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/spec/containerconfig.go b/pkg/spec/containerconfig.go
index 775a2042d..87c1b5155 100644
--- a/pkg/spec/containerconfig.go
+++ b/pkg/spec/containerconfig.go
@@ -3,11 +3,18 @@ package createconfig
import (
"github.com/containers/libpod/libpod"
spec "github.com/opencontainers/runtime-spec/specs-go"
+ "github.com/pkg/errors"
)
// MakeContainerConfig generates all configuration necessary to start a
// container with libpod from a completed CreateConfig struct.
func (config *CreateConfig) MakeContainerConfig(runtime *libpod.Runtime, pod *libpod.Pod) (*spec.Spec, []libpod.CtrCreateOption, error) {
+ if config.Pod != "" && pod == nil {
+ return nil, nil, errors.Wrapf(libpod.ErrInvalidArg, "pod was specified but no pod passed")
+ } else if config.Pod == "" && pod != nil {
+ return nil, nil, errors.Wrapf(libpod.ErrInvalidArg, "pod was given but no pod is specified")
+ }
+
runtimeSpec, namedVolumes, err := config.createConfigToOCISpec(runtime)
if err != nil {
return nil, nil, err