vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge cfa309d8ce into a69631c1bd

Browse source
This commit is contained in:
Urvashi Mohnani 2017-08-15 19:11:48 +00:00 • committed by GitHub
commit a05c0b7507
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/kpod/export.go
View file

@ -77,19 +77,25 @@ func exportCmd(c *cli.Context) error {
// exportContainer exports the contents of a container and saves it as // exportContainer exports the contents of a container and saves it as
// a tarball on disk // a tarball on disk
func exportContainer(store storage.Store, opts exportOptions) error { func exportContainer(store storage.Store, opts exportOptions) error {
mountPoint, err := store.Mount(opts.container, "") // gets the full container id when given a name or partial id
containerID, err := store.Lookup(opts.container)
if err != nil { if err != nil {
return errors.Wrapf(err, "error finding container %q", opts.container) return errors.Wrapf(err, "no such container %q", opts.container)
}
mountPoint, err := store.Mount(containerID, "")
if err != nil {
return errors.Wrapf(err, "error finding container %q", containerID)
} }
defer func() { defer func() {
if err := store.Unmount(opts.container); err != nil { if err := store.Unmount(containerID); err != nil {
fmt.Printf("error unmounting container %q: %v\n", opts.container, err) fmt.Printf("error unmounting container %q: %v\n", containerID, err)
} }
}() }()
input, err := archive.Tar(mountPoint, archive.Uncompressed) input, err := archive.Tar(mountPoint, archive.Uncompressed)
if err != nil { if err != nil {
return errors.Wrapf(err, "error reading container directory %q", opts.container) return errors.Wrapf(err, "error reading container directory %q", containerID)
} }
outFile, err := os.Create(opts.output) outFile, err := os.Create(opts.output)