diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 15:30:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-01 15:30:06 +0100 |
commit | e3f0b7db7508f1e1ecfdb23adb53531c89a29b99 (patch) | |
tree | c14bd42ae7fe6fd90679455efe932bd37d1f7a24 /pkg/spec/containerconfig.go | |
parent | 1316b2927be632ff717d9f7fd6a1633198c1ccaf (diff) | |
parent | f62a356515e387b0bbcf1f08b4831d139c2039b7 (diff) | |
download | podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.gz podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.bz2 podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.zip |
Merge pull request #8400 from rhatdan/varlink
Remove varlink support from podman
Diffstat (limited to 'pkg/spec/containerconfig.go')
-rw-r--r-- | pkg/spec/containerconfig.go | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/pkg/spec/containerconfig.go b/pkg/spec/containerconfig.go deleted file mode 100644 index f11d85b7e..000000000 --- a/pkg/spec/containerconfig.go +++ /dev/null @@ -1,41 +0,0 @@ -package createconfig - -import ( - "github.com/containers/podman/v2/libpod" - "github.com/containers/podman/v2/libpod/define" - spec "github.com/opencontainers/runtime-spec/specs-go" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" -) - -// 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(define.ErrInvalidArg, "pod was specified but no pod passed") - } else if config.Pod == "" && pod != nil { - return nil, nil, errors.Wrapf(define.ErrInvalidArg, "pod was given but no pod is specified") - } - - // Parse volumes flag into OCI spec mounts and libpod Named Volumes. - // If there is an identical mount in the OCI spec, we will replace it - // with a mount generated here. - mounts, namedVolumes, err := config.parseVolumes(runtime) - if err != nil { - return nil, nil, err - } - - runtimeSpec, err := config.createConfigToOCISpec(runtime, mounts) - if err != nil { - return nil, nil, err - } - - options, err := config.getContainerCreateOptions(runtime, pod, mounts, namedVolumes) - if err != nil { - return nil, nil, err - } - - logrus.Debugf("created OCI spec and options for new container") - - return runtimeSpec, options, nil -} |