diff options
| author | baude <bbaude@redhat.com> | 2018-10-17 16:42:05 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-17 17:04:19 -0500 |
| commit | bfc473f982ecdbfbe885d104036ecf9f70f3cd0f (patch) | |
| tree | c2c4992606864554b346ebbfa7bddc5061bd3bcc /libpod/image | |
| parent | 19c150bef12ff08abc8249cc21275266a7ac74a3 (diff) | |
| download | podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.tar.gz podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.tar.bz2 podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.zip | |
Vendor in new new buildah/ci
libpod requires new buildah and container image versions to resolve
bug #1640298
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/image.go | 5 | ||||
| -rw-r--r-- | libpod/image/pull.go | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index f39b1d78d..7e520d97e 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -552,7 +552,7 @@ func (i *Image) PushImageToReference(ctx context.Context, dest types.ImageRefere } } // Copy the image to the remote destination - err = cp.Image(ctx, policyContext, dest, src, copyOptions) + _, err = cp.Image(ctx, policyContext, dest, src, copyOptions) if err != nil { return errors.Wrapf(err, "Error copying image to the remote destination") } @@ -912,7 +912,8 @@ func (ir *Runtime) Import(ctx context.Context, path, reference string, writer io if err != nil { errors.Wrapf(err, "error getting image reference for %q", reference) } - if err = cp.Image(ctx, policyContext, dest, src, copyOptions); err != nil { + _, err = cp.Image(ctx, policyContext, dest, src, copyOptions) + if err != nil { return nil, err } return ir.NewFromLocal(reference) diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 9eac2b988..bfa04d069 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -255,7 +255,8 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa if writer != nil && (imageInfo.srcRef.Transport().Name() == DockerTransport || imageInfo.srcRef.Transport().Name() == AtomicTransport) { io.WriteString(writer, fmt.Sprintf("Trying to pull %s...", imageInfo.image)) } - if err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions); err != nil { + _, err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions) + if err != nil { pullErrors = multierror.Append(pullErrors, err) logrus.Debugf("Error pulling image ref %s: %v", imageInfo.srcRef.StringWithinTransport(), err) if writer != nil { |