starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-11-05 00:05:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): check image update

Browse Source
This commit is contained in:
guoyuqi
2026-11-04 18:29:24 +08:00
parent d1059c7356
commit 4ca3afba84
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/container_image_check_update.go
+12 -1
View File
@@ -299,8 +299,19 @@ func checkContainerImageUpdate(ctx context.Context, cli imageCheckUpdateDockerCl
record.LatestVersion = remote.target.Tag
record.TargetImage = "docker.io/" + repository + ":" + remote.target.Tag
record.TargetImageID = remote.target.ConfigDigest
sameImage := inspected.ID == remote.target.ConfigDigest
if inspected.Descriptor != nil {
// The containerd store uses the pulled index/manifest as its image ID,
// not the config digest. Persist the ID that pulling this tag will produce
// so post-upgrade reconciliation uses the same identity as Docker.
if remote.target.ReferenceDigest == "" {
return record, fmt.Errorf("Docker Hub manifest response is missing its digest")
}
record.TargetImageID = remote.target.ReferenceDigest
sameImage = inspected.ID == remote.target.ReferenceDigest || inspected.ID == remote.target.Digest
}
// Both versioned and floating tags can be republished with new image content.
record.HasUpdate = remote.target.Tag != tag || remote.target.ConfigDigest != inspected.ID
record.HasUpdate = remote.target.Tag != tag || !sameImage
return record, nil
}
return record, fmt.Errorf("no compatible image for %s/%s", platform.OS, platform.Architecture)
agent/utils/dockerhub/client.go
+10 -4
View File
@@ -42,7 +42,12 @@ type Client struct {
}
type Platform struct{ OS, Architecture, Variant string }
type Target struct{ Tag, Digest, ConfigDigest string }
type Target struct {
Tag string
Digest string // Platform-specific manifest digest.
ReferenceDigest string // Tag target: an image index or a single-platform manifest.
ConfigDigest string // Image configuration digest used by the classic Docker image store.
}
func New(ctx context.Context, repository, username, password string, httpClient *http.Client) (*Client, error) {
if httpClient == nil {
@@ -151,7 +156,8 @@ func (c *Client) Resolve(ctx context.Context, tag string, platform Platform) (Ta
if err != nil {
return Target{}, false, err
}
digest := headers.Get("Docker-Content-Digest")
referenceDigest := headers.Get("Docker-Content-Digest")
digest := referenceDigest
if len(m.Manifests) > 0 {
digest = ""
for _, item := range m.Manifests {
@@ -171,7 +177,7 @@ func (c *Client) Resolve(ctx context.Context, tag string, platform Platform) (Ta
if m.Config.Digest == "" {
return Target{}, false, fmt.Errorf("unsupported Docker Hub manifest")
}
// Validate single-platform manifests too; the config digest is the Docker Image ID.
// Validate single-platform manifests too; classic Docker image IDs use the config digest.
var config struct {
OS string `json:"os"`
Architecture string `json:"architecture"`
@@ -183,7 +189,7 @@ func (c *Client) Resolve(ctx context.Context, tag string, platform Platform) (Ta
if config.OS != platform.OS || config.Architecture != platform.Architecture || (platform.Variant != "" && config.Variant != "" && config.Variant != platform.Variant) {
return Target{}, false, nil
}
return Target{Tag: tag, Digest: digest, ConfigDigest: m.Config.Digest}, true, nil
return Target{Tag: tag, Digest: digest, ReferenceDigest: referenceDigest, ConfigDigest: m.Config.Digest}, true, nil
}
var versionPattern = regexp.MustCompile(`^v?(\d+)\.(\d+)(?:\.(\d+))?(-[a-zA-Z][a-zA-Z0-9_.-]*)?$`)