toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

WIP include catalogue checking in upgrade command

Browse Source
This commit is contained in:
decentral1se 2021-08-09 16:29:16 +02:00
parent 7b1a6dd4d7
commit 334e417abf
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/recipe/recipe.go
View File

@ -167,11 +167,10 @@ var recipeUpgradeCommand = &cli.Command{
for _, service := range compose.Services { for _, service := range compose.Services {
var compatible []tagcmp.Tag var compatible []tagcmp.Tag
// TODO: use to filter registry versions catlVersions, err := catalogue.VersionsOfService(recipe, service.Name)
// catlVersions, err := catalogue.VersionsOfService(recipe, service.Name) if err != nil {
// if err != nil { logrus.Fatal(err)
// logrus.Fatal(err) }
// }
img, err := reference.ParseNormalizedNamed(service.Image) img, err := reference.ParseNormalizedNamed(service.Image)
if err != nil { if err != nil {
@ -209,7 +208,15 @@ var recipeUpgradeCommand = &cli.Command{
var compatibleStrings []string var compatibleStrings []string
for _, compat := range compatible { for _, compat := range compatible {
compatibleStrings = append(compatibleStrings, compat.String()) skip := false
for _, catlVersion := range catlVersions {
if compat.String() == catlVersion {
skip = true
}
}
if !skip {
compatibleStrings = append(compatibleStrings, compat.String())
}
} }
var upgradeTag string var upgradeTag string