toolshed/abra
4
2
Fork 18
Code Issues 22 Pull Requests Packages Releases 41 Activity

4matting

Browse Source
This commit is contained in:
3wc
2025-09-02 13:59:30 -04:00
parent 2800692136
commit 7fd82e31cc
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cli/app/upgrade.go
View File

@ -234,7 +234,6 @@ beforehand. See "abra app backup" for more.`),
log.Fatal(err) log.Fatal(err)
} }
if showReleaseNotes { if showReleaseNotes {
fmt.Print(upgradeReleaseNotes) fmt.Print(upgradeReleaseNotes)
return return

2
pkg/client/configs.go
View File

@ -40,7 +40,7 @@ func RemoveConfigs(cl *client.Client, ctx context.Context, configNames []string,
} }
func GetConfigNameAndVersion(fullName string, stackName string) (string, string, error) { func GetConfigNameAndVersion(fullName string, stackName string) (string, string, error) {
name := strings.TrimPrefix(fullName, stackName + "_") name := strings.TrimPrefix(fullName, stackName+"_")
if lastUnderscore := strings.LastIndex(name, "_"); lastUnderscore != -1 { if lastUnderscore := strings.LastIndex(name, "_"); lastUnderscore != -1 {
return name[0:lastUnderscore], name[lastUnderscore+1:], nil return name[0:lastUnderscore], name[lastUnderscore+1:], nil
} else { } else {

4
pkg/deploy/utils.go
View File

@ -13,8 +13,8 @@ import (
"coopcloud.tech/abra/pkg/log" "coopcloud.tech/abra/pkg/log"
"coopcloud.tech/abra/pkg/secret" "coopcloud.tech/abra/pkg/secret"
"github.com/docker/docker/api/types/swarm"
composetypes "github.com/docker/cli/cli/compose/types" composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/docker/api/types/swarm"
dockerClient "github.com/docker/docker/client" dockerClient "github.com/docker/docker/client"
) )
@ -177,7 +177,7 @@ func GatherConfigsForDeploy(cl *dockerClient.Client, app appPkg.App, compose *co
return configInfo, nil return configInfo, nil
} }
func GatherImagesForDeploy(cl *dockerClient.Client, app appPkg.App, compose *composetypes.Config) ([]string, error){ func GatherImagesForDeploy(cl *dockerClient.Client, app appPkg.App, compose *composetypes.Config) ([]string, error) {
// Get current images from existing deployment // Get current images from existing deployment
currentImages, err := GetImagesForStack(cl, app) currentImages, err := GetImagesForStack(cl, app)