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

refactor: use cli context vs creating new one
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Roxie Gibson
2021-09-16 11:17:56 +01:00
parent a74a8bc21b
commit 0a1c73bf00
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/app/cp.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"os"
"strings"
@ -75,7 +74,6 @@ var appCpCommand = &cli.Command{
logrus.Fatal(err)
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -83,7 +81,7 @@ var appCpCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", fmt.Sprintf("%s_%s", appEnv.StackName(), service))
containers, err := cl.ContainerList(ctx, types.ContainerListOptions{Filters: filters})
containers, err := cl.ContainerList(c.Context, types.ContainerListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}
@ -107,11 +105,11 @@ var appCpCommand = &cli.Command{
}
copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
if err := cl.CopyToContainer(ctx, container.ID, dstPath, content, copyOpts); err != nil {
if err := cl.CopyToContainer(c.Context, container.ID, dstPath, content, copyOpts); err != nil {
logrus.Fatal(err)
}
} else {
content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath)
content, _, err := cl.CopyFromContainer(c.Context, container.ID, srcPath)
if err != nil {
logrus.Fatal(err)
}