Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix latest tag image always can update #191

Merged
merged 9 commits into from
May 28, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: fix latest tag image always can update
CorrectRoadH committed May 22, 2024
commit 75b1182178b6882fc6ce9d1ab85b29521d00f8a9
50 changes: 50 additions & 0 deletions pkg/docker/digest.go
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ import (
"github.com/docker/distribution/manifest/manifestlist"
"github.com/docker/distribution/manifest/schema1"
"github.com/docker/distribution/manifest/schema2"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
)

@@ -194,3 +196,51 @@ func addDefaultHeaders(header *http.Header, token string) {
// header.Add("Accept", schema1.MediaTypeManifest)
header.Add("Accept", v1.MediaTypeImageIndex)
}

func IsLatestImageUpdateAvailiable(imageName string) (bool, error) {
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
if err != nil {
return false, err
}

localDigest, err := getLocalImageDigest(cli, imageName)
if err != nil {
return false, err
}

remoteDigest, err := getRemoteImageDigest(cli, imageName)
if err != nil {
return false, err
}

return localDigest != remoteDigest, nil
}

// 获取本地镜像的Digest
func getLocalImageDigest(cli *client.Client, imageName string) (string, error) {
images, err := cli.ImageList(context.Background(), types.ImageListOptions{})
if err != nil {
return "", err
}

for _, image := range images {
for _, tag := range image.RepoTags {
if tag == imageName {
return image.ID, nil
}
}
}

return "", fmt.Errorf("未找到本地镜像:%s", imageName)
}

// 获取远程镜像的Digest
func getRemoteImageDigest(cli *client.Client, imageName string) (string, error) {
refStr := "docker.io/library/" + imageName
inspect, _, err := cli.ImageInspectWithRaw(context.Background(), refStr)
if err != nil {
return "", err
}

return inspect.ID, nil
}
28 changes: 4 additions & 24 deletions service/appstore_management.go
Original file line number Diff line number Diff line change
@@ -15,18 +15,16 @@ import (
"github.com/IceWhaleTech/CasaOS-Common/utils/file"
"github.com/IceWhaleTech/CasaOS-Common/utils/logger"
"github.com/bluele/gcache"
"github.com/docker/docker/client"
"github.com/samber/lo"
"go.uber.org/zap"
)

type AppStoreManagement struct {
isAppUpgradable gcache.Cache
defaultAppStore AppStore
isAppUpgrading sync.Map
onAppStoreRegister []func(string) error
onAppStoreUnregister []func(string) error

isAppUpgradable gcache.Cache
isAppUpgrading sync.Map
defaultAppStore AppStore
}

func (a *AppStoreManagement) AppStoreList() []codegen.AppStoreMetadata {
@@ -482,28 +480,10 @@ func (a *AppStoreManagement) IsUpdateAvailableWith(composeApp *ComposeApp, store
return false, err
}
if currentTag == "latest" {
ctx := context.Background()
cli, clientErr := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
if clientErr != nil {
logger.Error("failed to create docker client", zap.Error(clientErr))
return false, clientErr
}
defer cli.Close()

image, _ := docker.ExtractImageAndTag(mainService.Image)

imageInfo, _, clientErr := cli.ImageInspectWithRaw(ctx, image)
if clientErr != nil {
logger.Error("failed to inspect image", zap.Error(clientErr))
return false, clientErr
}
match, clientErr := docker.CompareDigest(mainService.Image, imageInfo.RepoDigests)
if clientErr != nil {
logger.Error("failed to compare digest", zap.Error(clientErr))
return false, clientErr
}
// match means no update available
return !match, nil
return docker.IsLatestImageUpdateAvailiable(image)
}
storeTag, err := storeComposeApp.MainTag()
return currentTag != storeTag, err