container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 17:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

kpod create should not do an OCI Init

Browse source 
We need to differentiate between a kpod create and a kpod start
kpod create should create all of the data for libpod, but kpod start should
generate content for OCI Runtime (runc) in order to run.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #96
Approved by: mheon
This commit is contained in:
Daniel J Walsh 2017-12-02 06:00:53 -05:00 committed by Atomic Bot
parent 55c8b69d8f
commit 95cb7a11f1
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/kpod/create.go
View file

@ -211,10 +211,6 @@ func createCmd(c *cli.Context) error {
}
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"))

5
cmd/kpod/start.go
View file

@ -5,6 +5,7 @@ import (
"sync"
"github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"os"
@ -82,6 +83,10 @@ func startCmd(c *cli.Context) error {
continue
}
if err := ctr.Init(); err != nil && errors.Cause(err) != libpod.ErrCtrExists {
return err
}
// We can only be interactive if both the config and the command-line say so
if c.Bool("interactive") && !ctr.Config().Stdin {
return errors.Errorf("the container was not created with the interactive option")

4
test/kpod_pause.bats
View file

@ -23,7 +23,7 @@ function teardown() {
}
@test "pause a created container by id" {
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} create $BB ls"
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} run -d $BB sleep 60"
echo "$output"
[ "$status" -eq 0 ]
ctr_id="$output"
@ -33,7 +33,7 @@ function teardown() {
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"
run bash -c "${KPOD_BINARY} ${KPOD_OPTIONS} rm -f $ctr_id"
echo "$output"
[ "$status" -eq 0 ]
}