diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 10:16:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:16:34 -0700 |
| commit | 8eb03d3e5388d02dbbe5382b5fdb346a45535f84 (patch) | |
| tree | 4bfe883e8e4f51af43b5c14c4e09fdaec889bc8d /cmd/podman/start.go | |
| parent | 1671ee557a6d354680be475991ca85a82f312a99 (diff) | |
| parent | ba65301c955454e47c3893ca548f18a845a4c4a9 (diff) | |
| download | podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.tar.gz podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.tar.bz2 podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.zip | |
Merge pull request #2746 from baude/remotecreate
podman-remote create|run
Diffstat (limited to 'cmd/podman/start.go')
| -rw-r--r-- | cmd/podman/start.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go index d17a78268..7d97319dd 100644 --- a/cmd/podman/start.go +++ b/cmd/podman/start.go @@ -7,6 +7,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/adapter" opentracing "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -109,7 +110,7 @@ func startCmd(c *cliconfig.StartValues) error { // attach to the container and also start it not already running // If the container is in a pod, also set to recursively start dependencies - err = startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, sigProxy, !ctrRunning, ctr.PodID() != "") + err = adapter.StartAttachCtr(ctx, ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, sigProxy, !ctrRunning, ctr.PodID() != "") if errors.Cause(err) == libpod.ErrDetach { // User manually detached // Exit cleanly immediately @@ -133,7 +134,7 @@ func startCmd(c *cliconfig.StartValues) error { if err != nil { return err } - ctrExitCode, err := readExitFile(rtc.TmpDir, ctr.ID()) + ctrExitCode, err := adapter.ReadExitFile(rtc.TmpDir, ctr.ID()) if err != nil { logrus.Errorf("Cannot get exit code: %v", err) exitCode = 127 |