opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-27 18:32:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

auto-update: use libimage for image checks

Browse Source 
Use the `HasDifferentDigest()` method of the image to replace the
previous checks if an image needs to be updated.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2021-06-25 10:51:30 +02:00
parent eda8d1f584
commit a8847c01fb
1 changed files with 1 additions and 32 deletions

33
pkg/autoupdate/autoupdate.go

@ -9,7 +9,6 @@ import (
"github.com/containers/common/pkg/config" "github.com/containers/common/pkg/config"
"github.com/containers/image/v5/docker" "github.com/containers/image/v5/docker"
"github.com/containers/image/v5/docker/reference" "github.com/containers/image/v5/docker/reference"
"github.com/containers/image/v5/manifest"
"github.com/containers/image/v5/transports/alltransports" "github.com/containers/image/v5/transports/alltransports"
"github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod"
"github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/define"
@ -299,37 +298,7 @@ func newerRemoteImageAvailable(runtime *libpod.Runtime, img *libimage.Image, ori
return false, err return false, err
} }
data, err := img.Inspect(context.Background(), false) return img.HasDifferentDigest(context.Background(), remoteRef)
if err != nil {
return false, err
}
sys := runtime.SystemContext()
if authfile != "" {
sys.AuthFilePath = authfile
}
// We need to account for the arch that the image uses. It seems
// common on ARM to tweak this option to pull the correct image. See
// github.com/containers/podman/issues/6613.
sys.ArchitectureChoice = data.Architecture
remoteImg, err := remoteRef.NewImage(context.Background(), sys)
if err != nil {
return false, err
}
rawManifest, _, err := remoteImg.Manifest(context.Background())
if err != nil {
return false, err
}
remoteDigest, err := manifest.Digest(rawManifest)
if err != nil {
return false, err
}
return img.Digest().String() != remoteDigest.String(), nil
} }
// newerLocalImageAvailable returns true if the container and local image have different digests // newerLocalImageAvailable returns true if the container and local image have different digests