diff options
author | baude <bbaude@redhat.com> | 2018-02-02 11:02:09 -0600 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-02 22:44:40 +0000 |
commit | 6ba6ecf59b9204d36388de07b866f157a4d13957 (patch) | |
tree | 53bc85dd3e9820eb09014b1db2f8d136e86f6799 /cmd/podman/create.go | |
parent | 3ea23f84818a816104ccdcf6b836ac4bb3a7c366 (diff) | |
download | podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.gz podman-6ba6ecf59b9204d36388de07b866f157a4d13957.tar.bz2 podman-6ba6ecf59b9204d36388de07b866f157a4d13957.zip |
Migrate Create|Commit to ginkgo
Migrate create and commit bats tests to the ginkgo
test suite. In doing so, some structures had to be
moved to pkg/podmanstructs/podmanstructs.go so we
could do better verification of test results.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #286
Approved by: rhatdan
Diffstat (limited to 'cmd/podman/create.go')
-rw-r--r-- | cmd/podman/create.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 045703074..ac6bc2969 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -17,6 +17,7 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" + "github.com/projectatomic/libpod/pkg/inspect" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) @@ -381,7 +382,7 @@ func exposedPorts(c *cli.Context, imageExposedPorts map[string]struct{}) (map[na // imageData pulls down the image if not stored locally and extracts the // default container runtime data out of it. imageData returns the data // to the caller. Example Data: Entrypoint, Env, WorkingDir, Labels ... -func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, string, *libpod.ImageData, error) { +func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, string, *inspect.ImageData, error) { var ( err error imageName, imageID string @@ -420,7 +421,7 @@ func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, s // Parses CLI options related to container creation into a config which can be // parsed into an OCI runtime spec -func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, data *libpod.ImageData) (*createConfig, error) { +func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, data *inspect.ImageData) (*createConfig, error) { var command []string var memoryLimit, memoryReservation, memorySwap, memoryKernel int64 var blkioWeight uint16 |