opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-12 08:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update kpod export to use the new container state and runtime

Browse Source 
Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>

Closes: #59
Approved by: rhatdan
This commit is contained in:
Urvashi Mohnani
2017-11-21 16:51:17 -05:00
committed by Atomic Bot
parent 91b406ea4a
commit 2a3934f1da
4 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
cmd/kpod/export.go
View File

@ -1,13 +1,8 @@
package main
import (
"io"
"os"
"fmt"
"github.com/containers/storage"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
@ -40,6 +35,16 @@ var (
// exportCmd saves a container to a tarball on disk
func exportCmd(c *cli.Context) error {
if err := validateFlags(c, exportFlags); err != nil {
return err
}
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "could not get runtime")
}
defer runtime.Shutdown(false)
args := c.Args()
if len(args) == 0 {
return errors.Errorf("container id must be specified")
@ -47,19 +52,6 @@ func exportCmd(c *cli.Context) error {
if len(args) > 1 {
return errors.Errorf("too many arguments given, need 1 at most.")
}
container := args[0]
if err := validateFlags(c, exportFlags); err != nil {
return err
}
config, err := getConfig(c)
if err != nil {
return errors.Wrapf(err, "could not get config")
}
store, err := getStore(config)
if err != nil {
return err
}
output := c.String("output")
if output == "/dev/stdout" {
@ -69,38 +61,10 @@ func exportCmd(c *cli.Context) error {
}
}
opts := exportOptions{
output: output,
container: container,
ctr, err := runtime.LookupContainer(args[0])
if err != nil {
return errors.Wrapf(err, "error looking up container %q", args[0])
}
return exportContainer(store, opts)
}
// exportContainer exports the contents of a container and saves it as
// a tarball on disk
func exportContainer(store storage.Store, opts exportOptions) error {
mountPoint, err := store.Mount(opts.container, "")
if err != nil {
return errors.Wrapf(err, "error finding container %q", opts.container)
}
defer func() {
if err := store.Unmount(opts.container); err != nil {
fmt.Printf("error unmounting container %q: %v\n", opts.container, err)
}
}()
input, err := archive.Tar(mountPoint, archive.Uncompressed)
if err != nil {
return errors.Wrapf(err, "error reading container directory %q", opts.container)
}
outFile, err := os.Create(opts.output)
if err != nil {
return errors.Wrapf(err, "error creating file %q", opts.output)
}
defer outFile.Close()
_, err = io.Copy(outFile, input)
return err
return ctr.Export(output)
}

2
cmd/kpod/rm.go
View File

@ -34,7 +34,7 @@ func rmCmd(c *cli.Context) error {
runtime, err := getRuntime(c)
if err != nil {
return errors.Wrapf(err, "Could not get runtime")
return errors.Wrapf(err, "could not get runtime")
}
defer runtime.Shutdown(false)