codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: drop swarmkit/etcd dep

Browse Source 
Part of coop-cloud/go-abra#57.
This commit is contained in:
decentral1se
2021-09-04 21:08:14 +02:00
parent f65090bd2f
commit da049ad69a
9 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/app.go
View File

@ -10,9 +10,8 @@ import (
"strings"
"coopcloud.tech/abra/client/convert"
"coopcloud.tech/abra/client/stack"
loader "coopcloud.tech/abra/client/stack"
"github.com/docker/cli/cli/command/stack/options"
stack "coopcloud.tech/abra/client/stack"
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/distribution/reference"
"github.com/sirupsen/logrus"
@ -236,7 +235,7 @@ func GetAppComposeFiles(recipe string, appEnv AppEnv) (*composetypes.Config, err
return &composetypes.Config{}, err
}
opts := options.Deploy{Composefiles: composeFiles}
opts := stack.Deploy{Composefiles: composeFiles}
compose, err := loader.LoadComposefile(opts, appEnv)
if err != nil {
return &composetypes.Config{}, err
@ -253,7 +252,7 @@ func UpdateAppComposeTag(recipe, image, tag string, appEnv AppEnv) error {
}
for _, composeFile := range composeFiles {
opts := options.Deploy{Composefiles: []string{composeFile}}
opts := stack.Deploy{Composefiles: []string{composeFile}}
compose, err := loader.LoadComposefile(opts, appEnv)
if err != nil {
return err
@ -306,7 +305,7 @@ func UpdateAppComposeLabel(recipe, serviceName, newLabel string, appEnv AppEnv)
}
for _, composeFile := range composeFiles {
opts := options.Deploy{Composefiles: []string{composeFile}}
opts := stack.Deploy{Composefiles: []string{composeFile}}
compose, err := loader.LoadComposefile(opts, appEnv)
if err != nil {
return err