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.

Sign up for GitHub

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 the issue that the expires shortened after merging cloned mirror #1051

Merged
merged 8 commits into from
Jan 13, 2021
Merged

Fix the issue that the expires shortened after merging cloned mirror #1051

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1cbe13
Fix the issue that the expires shortened after merging cloned mirror
lucklove Jan 8, 2021
7b1c68b
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
bfd95b4
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
11b55c1
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
450d404
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
552eebd
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
238b56b
Merge branch 'master' into fix-merge
ti-chi-bot Jan 12, 2021
eaebd26
Merge branch 'master' into fix-merge
lucklove Jan 13, 2021
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
15 changes: 12 additions & 3 deletions pkg/repository/v1manifest/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,18 @@ func RenewManifest(m ValidManifest, startTime time.Time) {
if m.Base().Version > 0 {
m.Base().Version++
}
m.Base().Expires = startTime.Add(
ManifestsConfig[m.Base().Ty].Expire,
).Format(time.RFC3339)

// only update expire field when it's old than target expire time
targetExpire := startTime.Add(ManifestsConfig[m.Base().Ty].Expire)
currentExpire, err := time.Parse(time.RFC3339, m.Base().Expires)
if err != nil {
m.Base().Expires = targetExpire.Format(time.RFC3339)
return
}

if currentExpire.Before(targetExpire) {
m.Base().Expires = targetExpire.Format(time.RFC3339)
}
}

// loadKeys stores all keys declared in manifest into ks.
Expand Down