moritz
/
abra
forked from coop-cloud/abra
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve some small issues

This commit is contained in:
Moritz 2023-02-08 19:08:40 +01:00
parent b4a9f6f4bb
commit 2da26852c6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli/updater/updater.go
View File

@ -105,21 +105,22 @@ var UpgradeApp = cli.Command{
if err != nil {
logrus.Fatal(err)
}
} else {
stacks, err := stack.GetStacks(cl)
return nil
}
stacks, err := stack.GetStacks(cl)
if err != nil {
logrus.Fatal(err)
}
for _, stackInfo := range stacks {
stackName := stackInfo.Name
recipeName, err := getLabel(cl, stackName, "recipe")
if err != nil {
logrus.Fatal(err)
}
for _, stackInfo := range stacks {
stackName := stackInfo.Name
recipeName, err := getLabel(cl, stackName, "recipe")
if err != nil {
logrus.Fatal(err)
}
err = tryUpgrade(cl, stackName, recipeName)
if err != nil {
logrus.Fatal(err)
}
err = tryUpgrade(cl, stackName, recipeName)
if err != nil {
logrus.Fatal(err)
}
}
return nil
@ -309,7 +310,6 @@ func mergeAbraShEnv(recipeName string, env config.AppEnv) error {
// createDeployConfig merges and enriches the compose config for the deployment
func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
// Workaround, is there a better way?
env["STACK_NAME"] = stackName
deployOpts := stack.Deploy{

2
pkg/upstream/stack/stack.go
View File

@ -486,7 +486,7 @@ If a service is failing to even start, try smoke out the error with:
}
}
// FIXME: Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go because I could't import "github.com/docker/cli/cli/command/stack/swarm"
// Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go
// GetStacks lists the swarm stacks.
func GetStacks(cl *dockerClient.Client) ([]*formatter.Stack, error) {
services, err := cl.ServiceList(