summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-12-19 09:07:49 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-12-19 18:51:52 +0000
commit94a810751539afeb1590ccc1a9745f1d5767fda2 (patch)
tree0e143bd90c976c60db4f0435d12c6266e0fe3e72 /libpod
parentc0432eb0e8a2c777a5c6d8caa01475c06553594c (diff)
downloadpodman-94a810751539afeb1590ccc1a9745f1d5767fda2.tar.gz
podman-94a810751539afeb1590ccc1a9745f1d5767fda2.tar.bz2
podman-94a810751539afeb1590ccc1a9745f1d5767fda2.zip
Add support for adding devices to container
Also add --quiet option to kpod create/run since this will help with writing tests. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #140 Approved by: TomSweeneyRedHat
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_img.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index 6107c2fdb..53211ff54 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -397,7 +397,7 @@ func (k *Image) HasLatest() (bool, error) {
}
// Pull is a wrapper function to pull and image
-func (k *Image) Pull() error {
+func (k *Image) Pull(writer io.Writer) error {
// If the image hasn't been decomposed yet
if !k.beenDecomposed {
err := k.Decompose()
@@ -405,7 +405,7 @@ func (k *Image) Pull() error {
return err
}
}
- k.runtime.PullImage(k.PullName, CopyOptions{Writer: os.Stdout, SignaturePolicyPath: k.runtime.config.SignaturePolicyPath})
+ k.runtime.PullImage(k.PullName, CopyOptions{Writer: writer, SignaturePolicyPath: k.runtime.config.SignaturePolicyPath})
return nil
}