mirror of https://github.com/containers/podman.git
Buffer stdin to a file when importing "-"
When importing an image from a file somewhere, we already know how to download data from a URL to a file, so do the same for stdin, in case it's unexpectedly large. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
parent
6421208e0f
commit
135b670a2e
|
@ -14,6 +14,7 @@ import (
|
||||||
"github.com/containers/libpod/pkg/util"
|
"github.com/containers/libpod/pkg/util"
|
||||||
"github.com/containers/storage"
|
"github.com/containers/storage"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
|
||||||
"github.com/containers/image/directory"
|
"github.com/containers/image/directory"
|
||||||
dockerarchive "github.com/containers/image/docker/archive"
|
dockerarchive "github.com/containers/image/docker/archive"
|
||||||
|
@ -183,6 +184,15 @@ func (r *Runtime) Import(ctx context.Context, source string, reference string, c
|
||||||
defer os.Remove(file)
|
defer os.Remove(file)
|
||||||
source = file
|
source = file
|
||||||
}
|
}
|
||||||
|
// if it's stdin, buffer it, too
|
||||||
|
if source == "-" {
|
||||||
|
file, err := downloadFromFile(os.Stdin)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer os.Remove(file)
|
||||||
|
source = file
|
||||||
|
}
|
||||||
|
|
||||||
newImage, err := r.imageRuntime.Import(ctx, source, reference, writer, image.SigningOptions{}, config)
|
newImage, err := r.imageRuntime.Import(ctx, source, reference, writer, image.SigningOptions{}, config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -216,6 +226,25 @@ func downloadFromURL(source string) (string, error) {
|
||||||
return outFile.Name(), nil
|
return outFile.Name(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// donwloadFromFile reads all of the content from the reader and temporarily
|
||||||
|
// saves in it /var/tmp/importxyz, which is deleted after the image is imported
|
||||||
|
func downloadFromFile(reader *os.File) (string, error) {
|
||||||
|
outFile, err := ioutil.TempFile("/var/tmp", "import")
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrap(err, "error creating file")
|
||||||
|
}
|
||||||
|
defer outFile.Close()
|
||||||
|
|
||||||
|
logrus.Debugf("saving %s to %s", reader.Name(), outFile.Name())
|
||||||
|
|
||||||
|
_, err = io.Copy(outFile, reader)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.Wrapf(err, "error saving %s to %s", reader.Name(), outFile.Name())
|
||||||
|
}
|
||||||
|
|
||||||
|
return outFile.Name(), nil
|
||||||
|
}
|
||||||
|
|
||||||
// LoadImage loads a container image into local storage
|
// LoadImage loads a container image into local storage
|
||||||
func (r *Runtime) LoadImage(ctx context.Context, name, inputFile string, writer io.Writer, signaturePolicy string) (string, error) {
|
func (r *Runtime) LoadImage(ctx context.Context, name, inputFile string, writer io.Writer, signaturePolicy string) (string, error) {
|
||||||
var newImages []*image.Image
|
var newImages []*image.Image
|
||||||
|
|
Loading…
Reference in New Issue