summaryrefslogtreecommitdiff
path: root/pkg/autoupdate
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-09-20 13:27:47 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-09-20 13:29:14 +0200
commit4406ebb46178bd10e25215649d4df7e61db53062 (patch)
tree93b0e2f2534c3e6982d431f326f0d132ed92ee98 /pkg/autoupdate
parentd6884dedc3386c7fa07018241d01e86c527bbe3f (diff)
downloadpodman-4406ebb46178bd10e25215649d4df7e61db53062.tar.gz
podman-4406ebb46178bd10e25215649d4df7e61db53062.tar.bz2
podman-4406ebb46178bd10e25215649d4df7e61db53062.zip
[3.4] vendor c/common@v0.44.1
Finalizes the linked BZ to fix passing down custom authfiles during auto updates. Also fixes the if-newer pull policy. [NO TESTS NEEDED] for now validated manually. A new system test will be added to the main branch shortly. BZ: bugzilla.redhat.com/show_bug.cgi?id=2000943 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/autoupdate')
-rw-r--r--pkg/autoupdate/autoupdate.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/autoupdate/autoupdate.go b/pkg/autoupdate/autoupdate.go
index 894178bb9..29c234ce9 100644
--- a/pkg/autoupdate/autoupdate.go
+++ b/pkg/autoupdate/autoupdate.go
@@ -404,7 +404,8 @@ func newerRemoteImageAvailable(ctx context.Context, runtime *libpod.Runtime, img
if err != nil {
return false, err
}
- return img.HasDifferentDigest(ctx, remoteRef)
+ options := &libimage.HasDifferentDigestOptions{AuthFilePath: authfile}
+ return img.HasDifferentDigest(ctx, remoteRef, options)
}
// newerLocalImageAvailable returns true if the container and local image have different digests