kairos/kairos-sdk
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-sdk.git synced 2025-09-12 21:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve GetImage platform handling (#557)

Browse Source
This commit is contained in:
Itxaka
2025-02-28 10:49:14 +01:00
committed by GitHub
parent fcbbc80f24
commit 228b87bc8a
4 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utils/image.go
View File

@@ -103,22 +103,28 @@ func GetImage(targetImage, targetPlatform string, auth *registrytypes.AuthConfig
transport.WithRetryPredicate(defaultRetryPredicate),
)
// Try to get the image from the local Docker daemon
image, err = daemon.Image(ref)
if err != nil {
opts := []remote.Option{
remote.WithTransport(tr),
remote.WithPlatform(*platform),
if err == nil {
// Check if the image matches the requested platform
imgConfig, err := image.ConfigFile()
if err == nil && imgConfig.Architecture == platform.Architecture && imgConfig.OS == platform.OS {
return image, nil
}
if auth != nil {
opts = append(opts, remote.WithAuth(staticAuth{auth}))
} else {
opts = append(opts, remote.WithAuthFromKeychain(authn.DefaultKeychain))
}
image, err = remote.Image(ref, opts...)
}
opts := []remote.Option{
remote.WithTransport(tr),
remote.WithPlatform(*platform),
}
if auth != nil {
opts = append(opts, remote.WithAuth(staticAuth{auth}))
} else {
opts = append(opts, remote.WithAuthFromKeychain(authn.DefaultKeychain))
}
image, err = remote.Image(ref, opts...)
return image, err
}