forked from coop-cloud/abra
resolve some small issues
This commit is contained in:
parent
b4a9f6f4bb
commit
2da26852c6
|
@ -105,21 +105,22 @@ var UpgradeApp = cli.Command{
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
} else {
|
return nil
|
||||||
stacks, err := stack.GetStacks(cl)
|
}
|
||||||
|
|
||||||
|
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 {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
for _, stackInfo := range stacks {
|
err = tryUpgrade(cl, stackName, recipeName)
|
||||||
stackName := stackInfo.Name
|
if err != nil {
|
||||||
recipeName, err := getLabel(cl, stackName, "recipe")
|
logrus.Fatal(err)
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
err = tryUpgrade(cl, stackName, recipeName)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
@ -309,7 +310,6 @@ func mergeAbraShEnv(recipeName string, env config.AppEnv) error {
|
||||||
|
|
||||||
// createDeployConfig merges and enriches the compose config for the deployment
|
// createDeployConfig merges and enriches the compose config for the deployment
|
||||||
func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
|
func createDeployConfig(recipeName string, stackName string, env config.AppEnv) (*composetypes.Config, stack.Deploy, error) {
|
||||||
// Workaround, is there a better way?
|
|
||||||
env["STACK_NAME"] = stackName
|
env["STACK_NAME"] = stackName
|
||||||
|
|
||||||
deployOpts := stack.Deploy{
|
deployOpts := stack.Deploy{
|
||||||
|
|
|
@ -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.
|
// GetStacks lists the swarm stacks.
|
||||||
func GetStacks(cl *dockerClient.Client) ([]*formatter.Stack, error) {
|
func GetStacks(cl *dockerClient.Client) ([]*formatter.Stack, error) {
|
||||||
services, err := cl.ServiceList(
|
services, err := cl.ServiceList(
|
||||||
|
|
Loading…
Reference in New Issue