toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

resolve some small issues
All checks were successful
continuous-integration/drone/pr Build is passing
Details

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

6
cli/updater/updater.go
View File

@ -105,7 +105,9 @@ 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 { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
@ -121,7 +123,6 @@ var UpgradeApp = cli.Command{
logrus.Fatal(err) 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{

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. // 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(