revert: always clone latest recipe changes
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This change was about trying to optimise for offline scenarios but caused a lot of issues for the online case. It needs to be thought through again. See coop-cloud/organising#471. Closes coop-cloud/organising#432.
This commit is contained in:
parent
9f478dac1d
commit
949510d4c3
|
@ -120,9 +120,9 @@ func ensureServerFlag() error {
|
||||||
|
|
||||||
// NewAction is the new app creation logic
|
// NewAction is the new app creation logic
|
||||||
func NewAction(c *cli.Context) error {
|
func NewAction(c *cli.Context) error {
|
||||||
recipe := ValidateRecipeWithPrompt(c, runtime.WithEnsureRecipeLatest(false))
|
recipe := ValidateRecipeWithPrompt(c)
|
||||||
|
conf := runtime.New()
|
||||||
|
|
||||||
conf := runtime.New(runtime.WithEnsureRecipeLatest(false))
|
|
||||||
if err := recipePkg.EnsureUpToDate(recipe.Name, conf); err != nil {
|
if err := recipePkg.EnsureUpToDate(recipe.Name, conf); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ import (
|
||||||
gitPkg "coopcloud.tech/abra/pkg/git"
|
gitPkg "coopcloud.tech/abra/pkg/git"
|
||||||
"coopcloud.tech/abra/pkg/recipe"
|
"coopcloud.tech/abra/pkg/recipe"
|
||||||
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/runtime"
|
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/docker/distribution/reference"
|
"github.com/docker/distribution/reference"
|
||||||
|
@ -59,7 +58,7 @@ your SSH keys configured on your account.
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c, runtime.WithEnsureRecipeLatest(false))
|
recipe := internal.ValidateRecipeWithPrompt(c)
|
||||||
|
|
||||||
imagesTmp, err := getImageVersions(recipe)
|
imagesTmp, err := getImageVersions(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -8,7 +8,6 @@ import (
|
||||||
"coopcloud.tech/abra/cli/internal"
|
"coopcloud.tech/abra/cli/internal"
|
||||||
"coopcloud.tech/abra/pkg/autocomplete"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/runtime"
|
|
||||||
"coopcloud.tech/tagcmp"
|
"coopcloud.tech/tagcmp"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
|
@ -42,7 +41,7 @@ auto-generate it for you. The <recipe> configuration will be updated on the
|
||||||
local file system.
|
local file system.
|
||||||
`,
|
`,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipeWithPrompt(c, runtime.WithEnsureRecipeLatest(false))
|
recipe := internal.ValidateRecipeWithPrompt(c)
|
||||||
|
|
||||||
mainApp, err := internal.GetMainAppImage(recipe)
|
mainApp, err := internal.GetMainAppImage(recipe)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"coopcloud.tech/abra/pkg/autocomplete"
|
"coopcloud.tech/abra/pkg/autocomplete"
|
||||||
"coopcloud.tech/abra/pkg/formatter"
|
"coopcloud.tech/abra/pkg/formatter"
|
||||||
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
recipePkg "coopcloud.tech/abra/pkg/recipe"
|
||||||
"coopcloud.tech/abra/pkg/runtime"
|
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
@ -21,7 +20,7 @@ var recipeVersionCommand = cli.Command{
|
||||||
Before: internal.SubCommandBefore,
|
Before: internal.SubCommandBefore,
|
||||||
BashComplete: autocomplete.RecipeNameComplete,
|
BashComplete: autocomplete.RecipeNameComplete,
|
||||||
Action: func(c *cli.Context) error {
|
Action: func(c *cli.Context) error {
|
||||||
recipe := internal.ValidateRecipe(c, runtime.WithEnsureRecipeLatest(false))
|
recipe := internal.ValidateRecipe(c)
|
||||||
|
|
||||||
catalogue, err := recipePkg.ReadRecipeCatalogue()
|
catalogue, err := recipePkg.ReadRecipeCatalogue()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -114,7 +114,7 @@ update chaos deployments use the "--chaos" flag. Use it with care.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
conf := runtime.New(runtime.WithEnsureRecipeLatest(true))
|
conf := runtime.New()
|
||||||
|
|
||||||
if !updateAll {
|
if !updateAll {
|
||||||
stackName := c.Args().Get(0)
|
stackName := c.Args().Get(0)
|
||||||
|
|
|
@ -21,6 +21,7 @@ type Option func(c *Config)
|
||||||
func New(opts ...Option) *Config {
|
func New(opts ...Option) *Config {
|
||||||
conf := &Config{
|
conf := &Config{
|
||||||
EnsureRecipeExists: true,
|
EnsureRecipeExists: true,
|
||||||
|
EnsureRecipeLatest: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, optFunc := range opts {
|
for _, optFunc := range opts {
|
||||||
|
|
Loading…
Reference in New Issue