summaryrefslogtreecommitdiff
path: root/libpod/image/image.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-04-14 15:34:48 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-04-14 23:55:24 +0000
commitfa8442e4a063b9a074cd2d17effdf5de138f90cb (patch)
tree9bf00bed67a58ad35c9eb7ac6f176e3bb48fa4fd /libpod/image/image.go
parent62b59df053357f040d85c26727734815046e2bc3 (diff)
downloadpodman-fa8442e4a063b9a074cd2d17effdf5de138f90cb.tar.gz
podman-fa8442e4a063b9a074cd2d17effdf5de138f90cb.tar.bz2
podman-fa8442e4a063b9a074cd2d17effdf5de138f90cb.zip
podman pull should always try to pull
In the case where you have an image local, if the the user runs podman pull, we should always attempt to pull an updated image. Added a forceRemote bool to New (image) so we can differentiate between "pull" or run because the actions differ. Run does not need to pull the latest -- only run. Signed-off-by: baude <bbaude@redhat.com> Closes: #618 Approved by: baude
Diffstat (limited to 'libpod/image/image.go')
-rw-r--r--libpod/image/image.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index 009c51886..89da71cb6 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -117,18 +117,20 @@ func (ir *Runtime) NewFromLocal(name string) (*Image, error) {
// New creates a new image object where the image could be local
// or remote
-func (ir *Runtime) New(name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *DockerRegistryOptions, signingoptions SigningOptions) (*Image, error) {
+func (ir *Runtime) New(name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *DockerRegistryOptions, signingoptions SigningOptions, forcePull bool) (*Image, error) {
// We don't know if the image is local or not ... check local first
newImage := Image{
InputName: name,
Local: false,
imageruntime: ir,
}
- localImage, err := newImage.getLocalImage()
- if err == nil {
- newImage.Local = true
- newImage.image = localImage
- return &newImage, nil
+ if !forcePull {
+ localImage, err := newImage.getLocalImage()
+ if err == nil {
+ newImage.Local = true
+ newImage.image = localImage
+ return &newImage, nil
+ }
}
// The image is not local