Compare commits

..

3 Commits

Author SHA1 Message Date
a51a3b57f6 change usage of tags to recipe versions in deploy.go
Some checks failed
continuous-integration/drone/push Build is failing
2026-01-11 19:32:03 +01:00
683a3bbf3d Merge branch 'main' into fixBrokenRecipeCheckout
Some checks failed
continuous-integration/drone/push Build is failing
2026-01-11 18:19:12 +00:00
ae9e49e1b5 fix: breaking GetRecipeVersions when an invalid recipe version exists
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2026-01-11 19:00:49 +01:00
8 changed files with 81 additions and 83 deletions

View File

@ -281,13 +281,21 @@ checkout as-is. Recipe commit hashes are also supported as values for
}
func getLatestVersionOrCommit(app appPkg.App) (string, error) {
versions, err := app.Recipe.Tags()
recipeVersions, warnings, err := app.Recipe.GetRecipeVersions()
if err != nil {
return "", err
}
if len(versions) > 0 && !internal.Chaos {
return versions[len(versions)-1], nil
for _, warning := range warnings {
log.Warn(warning)
}
if len(recipeVersions) > 0 && !internal.Chaos {
latest := recipeVersions[len(recipeVersions)-1]
for tag := range latest {
log.Debug(i18n.G("selected latest recipe version: %s (from %d available versions)", tag, len(recipeVersions)))
return tag, nil
}
}
head, err := app.Recipe.Head()

View File

@ -113,13 +113,6 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
totalAppsCount++
if status {
if err := app.Recipe.EnsureUpToDate(); err != nil {
log.Warnf(
"failed to ensure repo is up to date for recipe: %s err: %s",
app.Recipe.Name,
err,
)
}
status := i18n.G("unknown")
version := i18n.G("unknown")
chaos := i18n.G("unknown")

View File

@ -98,10 +98,14 @@ var AppNewCommand = &cobra.Command{
var recipeVersions recipePkg.RecipeVersions
if recipeVersion == "" {
var err error
recipeVersions, _, err = recipe.GetRecipeVersions()
var warnings []string
recipeVersions, warnings, err = recipe.GetRecipeVersions()
if err != nil {
log.Fatal(err)
}
for _, warning := range warnings {
log.Warn(warning)
}
}
if len(recipeVersions) > 0 {
@ -110,6 +114,8 @@ var AppNewCommand = &cobra.Command{
recipeVersion = tag
}
log.Debug(i18n.G("selected recipe version: %s (from %d available versions)", recipeVersion, len(recipeVersions)))
if _, err := recipe.EnsureVersion(recipeVersion); err != nil {
log.Fatal(err)
}

View File

@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL\n"
"POT-Creation-Date: 2026-01-17 00:44+0100\n"
"POT-Creation-Date: 2025-12-21 16:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -625,7 +625,7 @@ msgstr ""
msgid "C"
msgstr ""
#: ./cli/app/list.go:232 ./cli/app/ps.go:189
#: ./cli/app/list.go:225 ./cli/app/ps.go:189
msgid "CHAOS"
msgstr ""
@ -774,7 +774,7 @@ msgstr ""
msgid "DEPLOYED LABELS"
msgstr ""
#: ./cli/app/list.go:228 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208
#: ./cli/app/list.go:221 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208
msgid "DOMAIN"
msgstr ""
@ -1143,7 +1143,7 @@ msgstr ""
msgid "README.md metadata filled in"
msgstr ""
#: ./cli/app/list.go:228 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209
#: ./cli/app/list.go:221 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209
msgid "RECIPE"
msgstr ""
@ -1259,7 +1259,7 @@ msgstr ""
msgid "Run app commands"
msgstr ""
#: ./cli/app/backup.go:303 ./cli/app/list.go:299 ./cli/app/logs.go:109 ./cli/app/new.go:389
#: ./cli/app/backup.go:303 ./cli/app/list.go:292 ./cli/app/logs.go:109 ./cli/app/new.go:389
msgid "S"
msgstr ""
@ -1271,7 +1271,7 @@ msgstr ""
msgid "SECRETS OVERVIEW"
msgstr ""
#: ./cli/app/list.go:228 ./cli/internal/deploy.go:80
#: ./cli/app/list.go:221 ./cli/internal/deploy.go:80
msgid "SERVER"
msgstr ""
@ -1296,7 +1296,7 @@ msgstr ""
msgid "SSO"
msgstr ""
#: ./cli/app/list.go:231 ./cli/app/ps.go:186
#: ./cli/app/list.go:224 ./cli/app/ps.go:186
msgid "STATUS"
msgstr ""
@ -1481,7 +1481,7 @@ msgstr ""
msgid "UNDEPLOY"
msgstr ""
#: ./cli/app/list.go:234 ./cli/internal/deploy.go:174
#: ./cli/app/list.go:227 ./cli/internal/deploy.go:174
msgid "UPGRADE"
msgstr ""
@ -1581,7 +1581,7 @@ msgstr ""
msgid "VALUE"
msgstr ""
#: ./cli/app/list.go:233 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110
#: ./cli/app/list.go:226 ./cli/app/ps.go:188 ./cli/app/secret.go:481 ./cli/recipe/version.go:69 ./cli/recipe/version.go:110
msgid "VERSION"
msgstr ""
@ -3386,7 +3386,7 @@ msgstr ""
msgid "labels <domain> [flags]"
msgstr ""
#: ./cli/app/deploy.go:427 ./cli/app/list.go:189
#: ./cli/app/deploy.go:427 ./cli/app/list.go:182
msgid "latest"
msgstr ""
@ -3510,11 +3510,11 @@ msgstr ""
#. with no spaces in between
#. translators: `abra man` aliases. use a comma separated list of aliases
#. with no spaces in between
#: ./cli/app/list.go:322 ./cli/app/move.go:34 ./cli/app/ps.go:205 ./cli/app/secret.go:553 ./cli/app/secret.go:649 ./cli/recipe/list.go:104 ./cli/recipe/upgrade.go:374 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106
#: ./cli/app/list.go:315 ./cli/app/move.go:34 ./cli/app/ps.go:205 ./cli/app/secret.go:553 ./cli/app/secret.go:649 ./cli/recipe/list.go:104 ./cli/recipe/upgrade.go:374 ./cli/recipe/version.go:139 ./cli/run.go:152 ./cli/server/list.go:106
msgid "m"
msgstr ""
#: ./cli/app/list.go:321 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:373 ./cli/recipe/version.go:138 ./cli/server/list.go:105
#: ./cli/app/list.go:314 ./cli/app/ps.go:204 ./cli/app/secret.go:552 ./cli/app/secret.go:648 ./cli/recipe/list.go:103 ./cli/recipe/upgrade.go:373 ./cli/recipe/version.go:138 ./cli/server/list.go:105
msgid "machine"
msgstr ""
@ -4026,7 +4026,7 @@ msgstr ""
msgid "previous git tags detected, assuming new semver release"
msgstr ""
#: ./cli/app/list.go:324 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:376 ./cli/recipe/version.go:141 ./cli/server/list.go:108
#: ./cli/app/list.go:317 ./cli/app/ps.go:207 ./cli/app/secret.go:555 ./cli/app/secret.go:651 ./cli/recipe/list.go:106 ./cli/recipe/upgrade.go:376 ./cli/recipe/version.go:141 ./cli/server/list.go:108
msgid "print machine-readable output"
msgstr ""
@ -4096,7 +4096,7 @@ msgstr ""
#. with no spaces in between
#. translators: `abra recipe` aliases. use a comma separated list of aliases
#. with no spaces in between
#: ./cli/app/backup.go:327 ./cli/app/list.go:307 ./cli/app/move.go:350 ./cli/app/run.go:23 ./cli/app/upgrade.go:486 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:274
#: ./cli/app/backup.go:327 ./cli/app/list.go:300 ./cli/app/move.go:350 ./cli/app/run.go:23 ./cli/app/upgrade.go:486 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:649 ./cli/recipe/sync.go:274
msgid "r"
msgstr ""
@ -4174,7 +4174,7 @@ msgid "readme: %s, "
msgstr ""
#. translators: `abra recipe` command for autocompletion
#: ./cli/app/list.go:306 ./cli/app/list.go:313 ./cli/run.go:99
#: ./cli/app/list.go:299 ./cli/app/list.go:306 ./cli/run.go:99
msgid "recipe"
msgstr ""
@ -4559,7 +4559,7 @@ msgstr ""
#. aliases with no spaces in between
#. translators: `abra server` aliases. use a comma separated list of aliases
#. with no spaces in between
#: ./cli/app/backup.go:198 ./cli/app/backup.go:263 ./cli/app/backup.go:287 ./cli/app/env.go:333 ./cli/app/list.go:330 ./cli/app/logs.go:101 ./cli/app/new.go:358 ./cli/app/restore.go:114 ./cli/app/secret.go:535 ./cli/catalogue/catalogue.go:27 ./cli/catalogue/catalogue.go:310 ./cli/recipe/fetch.go:130 ./cli/recipe/sync.go:28 ./cli/server/server.go:12
#: ./cli/app/backup.go:198 ./cli/app/backup.go:263 ./cli/app/backup.go:287 ./cli/app/env.go:333 ./cli/app/list.go:323 ./cli/app/logs.go:101 ./cli/app/new.go:358 ./cli/app/restore.go:114 ./cli/app/secret.go:535 ./cli/catalogue/catalogue.go:27 ./cli/catalogue/catalogue.go:310 ./cli/recipe/fetch.go:130 ./cli/recipe/sync.go:28 ./cli/server/server.go:12
msgid "s"
msgstr ""
@ -4626,7 +4626,7 @@ msgid "secrets are %s shown again, please save them %s"
msgstr ""
#. translators: `abra server` command for autocompletion
#: ./cli/app/env.go:332 ./cli/app/env.go:339 ./cli/app/list.go:329 ./cli/app/list.go:336 ./cli/app/new.go:357 ./cli/app/new.go:364 ./cli/run.go:101
#: ./cli/app/env.go:332 ./cli/app/env.go:339 ./cli/app/list.go:322 ./cli/app/list.go:329 ./cli/app/new.go:357 ./cli/app/new.go:364 ./cli/run.go:101
msgid "server"
msgstr ""
@ -4748,15 +4748,15 @@ msgstr ""
msgid "show all paths"
msgstr ""
#: ./cli/app/list.go:301
#: ./cli/app/list.go:294
msgid "show app deployment status"
msgstr ""
#: ./cli/app/list.go:309
#: ./cli/app/list.go:302
msgid "show apps of a specific recipe"
msgstr ""
#: ./cli/app/list.go:332
#: ./cli/app/list.go:325
msgid "show apps of a specific server"
msgstr ""
@ -4898,7 +4898,7 @@ msgstr ""
msgid "ssh: SSH_AUTH_SOCK missing, --publish/-p will fail. see \"abra catalogue generate --help\""
msgstr ""
#: ./cli/app/list.go:298 ./cli/recipe/list.go:45
#: ./cli/app/list.go:291 ./cli/recipe/list.go:45
msgid "status"
msgstr ""
@ -5108,7 +5108,7 @@ msgstr ""
msgid "unable to clean up git clone of %s: %s"
msgstr ""
#: ./cli/app/list.go:155
#: ./cli/app/list.go:148
#, c-format
msgid "unable to clone %s: %s"
msgstr ""
@ -5241,7 +5241,7 @@ msgstr ""
msgid "unable to parse %s, skipping"
msgstr ""
#: ./cli/app/list.go:170
#: ./cli/app/list.go:163
#, c-format
msgid "unable to parse %s, skipping as upgrade option"
msgstr ""
@ -5321,7 +5321,7 @@ msgstr ""
msgid "unable to retrieve container for %s: %s"
msgstr ""
#: ./cli/app/list.go:160
#: ./cli/app/list.go:153
#, c-format
msgid "unable to retrieve tags for %s: %s"
msgstr ""
@ -5415,7 +5415,7 @@ msgstr ""
msgid "unimplemented call: SetWriteDeadline(%v)"
msgstr ""
#: ./cli/app/labels.go:78 ./cli/app/list.go:123 ./cli/app/list.go:124 ./cli/app/list.go:125 ./cli/app/list.go:126 ./cli/app/list.go:187 ./cli/app/ps.go:125 ./cli/app/ps.go:126 ./cli/app/ps.go:127 ./cli/app/ps.go:128 ./cli/app/ps.go:129 ./cli/server/list.go:65 ./cli/server/list.go:77
#: ./cli/app/labels.go:78 ./cli/app/list.go:116 ./cli/app/list.go:117 ./cli/app/list.go:118 ./cli/app/list.go:119 ./cli/app/list.go:180 ./cli/app/ps.go:125 ./cli/app/ps.go:126 ./cli/app/ps.go:127 ./cli/app/ps.go:128 ./cli/app/ps.go:129 ./cli/server/list.go:65 ./cli/server/list.go:77
msgid "unknown"
msgstr ""

View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL\n"
"POT-Creation-Date: 2026-01-17 00:44+0100\n"
"POT-Creation-Date: 2025-12-21 16:38+0100\n"
"PO-Revision-Date: 2025-12-10 01:43+0000\n"
"Last-Translator: chasqui <chasqui@cryptolab.net>\n"
"Language-Team: Spanish <https://translate.coopcloud.tech/projects/co-op-cloud/abra/es/>\n"
@ -645,7 +645,7 @@ msgstr ""
msgid "C"
msgstr ""
#: cli/app/list.go:232 cli/app/ps.go:189
#: cli/app/list.go:225 cli/app/ps.go:189
msgid "CHAOS"
msgstr ""
@ -798,7 +798,7 @@ msgstr ""
msgid "DEPLOYED LABELS"
msgstr ""
#: cli/app/list.go:228 cli/internal/deploy.go:78 cli/internal/deploy.go:208
#: cli/app/list.go:221 cli/internal/deploy.go:78 cli/internal/deploy.go:208
msgid "DOMAIN"
msgstr ""
@ -1178,7 +1178,7 @@ msgstr ""
msgid "README.md metadata filled in"
msgstr ""
#: cli/app/list.go:228 cli/internal/deploy.go:79 cli/internal/deploy.go:209
#: cli/app/list.go:221 cli/internal/deploy.go:79 cli/internal/deploy.go:209
msgid "RECIPE"
msgstr ""
@ -1298,7 +1298,7 @@ msgstr ""
msgid "Run app commands"
msgstr "💻 Ejecutar comandos en una aplicación 🚀"
#: cli/app/backup.go:303 cli/app/list.go:299 cli/app/logs.go:109
#: cli/app/backup.go:303 cli/app/list.go:292 cli/app/logs.go:109
#: cli/app/new.go:389
msgid "S"
msgstr ""
@ -1311,7 +1311,7 @@ msgstr ""
msgid "SECRETS OVERVIEW"
msgstr ""
#: cli/app/list.go:228 cli/internal/deploy.go:80
#: cli/app/list.go:221 cli/internal/deploy.go:80
msgid "SERVER"
msgstr ""
@ -1337,7 +1337,7 @@ msgstr ""
msgid "SSO"
msgstr ""
#: cli/app/list.go:231 cli/app/ps.go:186
#: cli/app/list.go:224 cli/app/ps.go:186
msgid "STATUS"
msgstr ""
@ -1530,7 +1530,7 @@ msgstr ""
msgid "UNDEPLOY"
msgstr ""
#: cli/app/list.go:234 cli/internal/deploy.go:174
#: cli/app/list.go:227 cli/internal/deploy.go:174
msgid "UPGRADE"
msgstr ""
@ -1635,7 +1635,7 @@ msgstr ""
msgid "VALUE"
msgstr ""
#: cli/app/list.go:233 cli/app/ps.go:188 cli/app/secret.go:481
#: cli/app/list.go:226 cli/app/ps.go:188 cli/app/secret.go:481
#: cli/recipe/version.go:69 cli/recipe/version.go:110
msgid "VERSION"
msgstr ""
@ -3474,7 +3474,7 @@ msgstr ""
msgid "labels <domain> [flags]"
msgstr "etiquetas <domain> [flags]"
#: cli/app/deploy.go:427 cli/app/list.go:189
#: cli/app/deploy.go:427 cli/app/list.go:182
msgid "latest"
msgstr ""
@ -3601,14 +3601,14 @@ msgstr "plataformas"
#. with no spaces in between
#. translators: `abra man` aliases. use a comma separated list of aliases
#. with no spaces in between
#: cli/app/list.go:322 cli/app/move.go:34 cli/app/ps.go:205
#: cli/app/list.go:315 cli/app/move.go:34 cli/app/ps.go:205
#: cli/app/secret.go:553 cli/app/secret.go:649 cli/recipe/list.go:104
#: cli/recipe/upgrade.go:374 cli/recipe/version.go:139 cli/run.go:152
#: cli/server/list.go:106
msgid "m"
msgstr ""
#: cli/app/list.go:321 cli/app/ps.go:204 cli/app/secret.go:552
#: cli/app/list.go:314 cli/app/ps.go:204 cli/app/secret.go:552
#: cli/app/secret.go:648 cli/recipe/list.go:103 cli/recipe/upgrade.go:373
#: cli/recipe/version.go:138 cli/server/list.go:105
msgid "machine"
@ -4134,7 +4134,7 @@ msgstr ""
msgid "previous git tags detected, assuming new semver release"
msgstr ""
#: cli/app/list.go:324 cli/app/ps.go:207 cli/app/secret.go:555
#: cli/app/list.go:317 cli/app/ps.go:207 cli/app/secret.go:555
#: cli/app/secret.go:651 cli/recipe/list.go:106 cli/recipe/upgrade.go:376
#: cli/recipe/version.go:141 cli/server/list.go:108
msgid "print machine-readable output"
@ -4207,7 +4207,7 @@ msgstr ""
#. with no spaces in between
#. translators: `abra recipe` aliases. use a comma separated list of aliases
#. with no spaces in between
#: cli/app/backup.go:327 cli/app/list.go:307 cli/app/move.go:350
#: cli/app/backup.go:327 cli/app/list.go:300 cli/app/move.go:350
#: cli/app/run.go:23 cli/app/upgrade.go:486 cli/catalogue/catalogue.go:302
#: cli/recipe/recipe.go:12 cli/recipe/release.go:649 cli/recipe/sync.go:274
msgid "r"
@ -4288,7 +4288,7 @@ msgid "readme: %s, "
msgstr ""
#. translators: `abra recipe` command for autocompletion
#: cli/app/list.go:306 cli/app/list.go:313 cli/run.go:99
#: cli/app/list.go:299 cli/app/list.go:306 cli/run.go:99
msgid "recipe"
msgstr ""
@ -4677,7 +4677,7 @@ msgstr ""
#. translators: `abra server` aliases. use a comma separated list of aliases
#. with no spaces in between
#: cli/app/backup.go:198 cli/app/backup.go:263 cli/app/backup.go:287
#: cli/app/env.go:333 cli/app/list.go:330 cli/app/logs.go:101
#: cli/app/env.go:333 cli/app/list.go:323 cli/app/logs.go:101
#: cli/app/new.go:358 cli/app/restore.go:114 cli/app/secret.go:535
#: cli/catalogue/catalogue.go:27 cli/catalogue/catalogue.go:310
#: cli/recipe/fetch.go:130 cli/recipe/sync.go:28 cli/server/server.go:12
@ -4747,8 +4747,8 @@ msgid "secrets are %s shown again, please save them %s"
msgstr ""
#. translators: `abra server` command for autocompletion
#: cli/app/env.go:332 cli/app/env.go:339 cli/app/list.go:329
#: cli/app/list.go:336 cli/app/new.go:357 cli/app/new.go:364 cli/run.go:101
#: cli/app/env.go:332 cli/app/env.go:339 cli/app/list.go:322
#: cli/app/list.go:329 cli/app/new.go:357 cli/app/new.go:364 cli/run.go:101
msgid "server"
msgstr ""
@ -4871,15 +4871,15 @@ msgstr ""
msgid "show all paths"
msgstr ""
#: cli/app/list.go:301
#: cli/app/list.go:294
msgid "show app deployment status"
msgstr ""
#: cli/app/list.go:309
#: cli/app/list.go:302
msgid "show apps of a specific recipe"
msgstr ""
#: cli/app/list.go:332
#: cli/app/list.go:325
msgid "show apps of a specific server"
msgstr ""
@ -5021,7 +5021,7 @@ msgstr ""
msgid "ssh: SSH_AUTH_SOCK missing, --publish/-p will fail. see \"abra catalogue generate --help\""
msgstr ""
#: cli/app/list.go:298 cli/recipe/list.go:45
#: cli/app/list.go:291 cli/recipe/list.go:45
msgid "status"
msgstr ""
@ -5233,7 +5233,7 @@ msgstr ""
msgid "unable to clean up git clone of %s: %s"
msgstr ""
#: cli/app/list.go:155
#: cli/app/list.go:148
#, c-format
msgid "unable to clone %s: %s"
msgstr ""
@ -5367,7 +5367,7 @@ msgstr ""
msgid "unable to parse %s, skipping"
msgstr ""
#: cli/app/list.go:170
#: cli/app/list.go:163
#, c-format
msgid "unable to parse %s, skipping as upgrade option"
msgstr ""
@ -5448,7 +5448,7 @@ msgstr ""
msgid "unable to retrieve container for %s: %s"
msgstr "🥷 Genera secretos (contraseñas) automáticamente 🤖"
#: cli/app/list.go:160
#: cli/app/list.go:153
#, c-format
msgid "unable to retrieve tags for %s: %s"
msgstr ""
@ -5542,8 +5542,8 @@ msgstr ""
msgid "unimplemented call: SetWriteDeadline(%v)"
msgstr ""
#: cli/app/labels.go:78 cli/app/list.go:123 cli/app/list.go:124
#: cli/app/list.go:125 cli/app/list.go:126 cli/app/list.go:187
#: cli/app/labels.go:78 cli/app/list.go:116 cli/app/list.go:117
#: cli/app/list.go:118 cli/app/list.go:119 cli/app/list.go:180
#: cli/app/ps.go:125 cli/app/ps.go:126 cli/app/ps.go:127 cli/app/ps.go:128
#: cli/app/ps.go:129 cli/server/list.go:65 cli/server/list.go:77
msgid "unknown"

View File

@ -403,15 +403,18 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
Branch: plumbing.ReferenceName(ref.Name()),
}
if err := worktree.Checkout(checkOutOpts); err != nil {
log.Debug(i18n.G("failed to check out %s in %s", tag, r.Dir))
return err
log.Debug(i18n.G("failed to check out %s in %s: %s", tag, r.Dir, err))
warnMsg = append(warnMsg, i18n.G("skipping tag %s: checkout failed: %s", tag, err))
return nil
}
log.Debug(i18n.G("git checkout: %s in %s", ref.Name(), r.Dir))
config, err := r.GetComposeConfig(nil)
if err != nil {
return err
log.Debug(i18n.G("failed to get compose config for %s: %s", tag, err))
warnMsg = append(warnMsg, i18n.G("skipping tag %s: invalid compose config: %s", tag, err))
return nil
}
versionMeta := make(map[string]ServiceMeta)
@ -419,7 +422,9 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
img, err := reference.ParseNormalizedNamed(service.Image)
if err != nil {
return err
log.Debug(i18n.G("failed to parse image for %s in %s: %s", service.Name, tag, err))
warnMsg = append(warnMsg, i18n.G("skipping tag %s: invalid image reference in service %s: %s", tag, service.Name, err))
return nil
}
path := reference.Path(img)
@ -445,6 +450,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
return nil
}); err != nil {
log.Warn(i18n.G("GetRecipeVersions encountered error for %s: %s (collected %d versions)", r.Name, err, len(versions)))
return versions, warnMsg, nil
}

View File

@ -67,16 +67,6 @@ teardown(){
assert_output --partial "$TEST_SERVER"
assert_output --partial "$TEST_APP_DOMAIN"
assert_output --partial "deployed"
assert_output --partial "latest"
_remove_tags
run $ABRA app ls --status
assert_success
assert_output --partial "$TEST_SERVER"
assert_output --partial "$TEST_APP_DOMAIN"
assert_output --partial "deployed"
assert_output --partial "latest"
}
@test "filter by server" {

View File

@ -17,12 +17,7 @@ _remove_tags(){
run bash -c 'git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag -l | wc -l'
assert_success
# If this was done without the --regexp I get this error:
# -- output differs --
# expected : 0
# actual : 0
# --
assert_output --regexp '[[:space:]]0'
assert_output '0'
}
_reset_tags() {