Merge pull request #79 from mheon/fix_create

Make 'kpod create' also create the container in runc
This commit is contained in:
Daniel J Walsh 2017-11-27 17:11:22 -05:00 committed by GitHub
commit 55167ef982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions

View file

@ -11,6 +11,7 @@ import (
"github.com/opencontainers/selinux/go-selinux/label"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
@ -206,6 +207,12 @@ func createCmd(c *cli.Context) error {
return err
}
logrus.Debug("new container created ", ctr.ID())
if err := ctr.Init(); err != nil {
return err
}
logrus.Debug("container storage created for %q", ctr.ID())
if c.String("cidfile") != "" {
libpod.WriteFile(ctr.ID(), c.String("cidfile"))
} else {

View file

@ -11,12 +11,14 @@ function teardown() {
}
@test "create a container based on local image" {
skip "Reenable after kpod rm merges, and use rm to clean up"
run ${KPOD_BINARY} ${KPOD_OPTIONS} create $BB ls
echo "$output"
[ "$status" -eq 0 ]
}
@test "create a container based on a remote image" {
skip "Reenable after kpod rm merges, and use rm to clean up"
run ${KPOD_BINARY} ${KPOD_OPTIONS} create ${BB_GLIBC} ls
echo "$output"
[ "$status" -eq 0 ]

View file

@ -29,7 +29,10 @@ function teardown() {
ctr_id="$output"
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} pause $ctr_id"
echo "$output"
[ "$status" -eq 1 ]
[ "$status" -eq 0 ]
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} unpause $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm $ctr_id"
echo "$output"
[ "$status" -eq 0 ]