fix: retain backwards compat with TYPE/RECIPE change
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
e9cfb076c6
commit
d3e127e5c8
|
@ -124,7 +124,10 @@ func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
|
||||||
|
|
||||||
recipe, exists := env["RECIPE"]
|
recipe, exists := env["RECIPE"]
|
||||||
if !exists {
|
if !exists {
|
||||||
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
|
recipe, exists = env["TYPE"]
|
||||||
|
if !exists {
|
||||||
|
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return App{
|
return App{
|
||||||
|
|
|
@ -35,16 +35,21 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
recipeName, exists := appEnv["RECIPE"]
|
||||||
|
if !exists {
|
||||||
|
recipeName, _ = appEnv["TYPE"]
|
||||||
|
}
|
||||||
|
|
||||||
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
|
||||||
if len(unsupportedProperties) > 0 {
|
if len(unsupportedProperties) > 0 {
|
||||||
logrus.Warnf("%s: ignoring unsupported options: %s",
|
logrus.Warnf("%s: ignoring unsupported options: %s",
|
||||||
appEnv["RECIPE"], strings.Join(unsupportedProperties, ", "))
|
recipeName, strings.Join(unsupportedProperties, ", "))
|
||||||
}
|
}
|
||||||
|
|
||||||
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
|
||||||
if len(deprecatedProperties) > 0 {
|
if len(deprecatedProperties) > 0 {
|
||||||
logrus.Warnf("%s: ignoring deprecated options: %s",
|
logrus.Warnf("%s: ignoring deprecated options: %s",
|
||||||
appEnv["RECIPE"], propertyWarnings(deprecatedProperties))
|
recipeName, propertyWarnings(deprecatedProperties))
|
||||||
}
|
}
|
||||||
return config, nil
|
return config, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue