diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2021-09-20 13:02:03 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2021-09-20 15:07:41 +0200 |
commit | 50981245706f7ab8dd57ddaf7efb39a171bbd97b (patch) | |
tree | aed73fef35ecf61ba70dcf46fc891d81022e566f /pkg/autoupdate | |
parent | b906ecbb5bc887f5123a0f61a5a51782aa34357f (diff) | |
download | podman-50981245706f7ab8dd57ddaf7efb39a171bbd97b.tar.gz podman-50981245706f7ab8dd57ddaf7efb39a171bbd97b.tar.bz2 podman-50981245706f7ab8dd57ddaf7efb39a171bbd97b.zip |
vendor c/common@main
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. There's a TODO to add a
new system test that I did not find time for before PTO.
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.go | 3 |
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 |