projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes comment formatting. No issue #
[arvados.git]
/
cmd
/
arvados-package
/
build.go
diff --git
a/cmd/arvados-package/build.go
b/cmd/arvados-package/build.go
index 68dda8a5e296069abd42905186d66c16c5a8c7af..2ce8a674322dedf410b331b496a7e31987ff01a1 100644
(file)
--- a/
cmd/arvados-package/build.go
+++ b/
cmd/arvados-package/build.go
@@
-16,6
+16,7
@@
import (
"path/filepath"
"strings"
"path/filepath"
"strings"
+ "git.arvados.org/arvados.git/lib/crunchrun"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
@@
-132,12
+133,19
@@
func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
if err != nil {
return err
}
if err != nil {
return err
}
+ cmd = exec.CommandContext(ctx, "ls", "-l", opts.PackageDir+"/"+packageFilename)
+ cmd.Stdout = stdout
+ cmd.Stderr = stderr
+ err = cmd.Run()
+ if err != nil {
+ return err
+ }
return nil
}
func dockerRm(ctx context.Context, name string) error {
return nil
}
func dockerRm(ctx context.Context, name string) error {
- cli, err := client.NewClient(client.DefaultDockerHost,
"1.21"
, nil, nil)
+ cli, err := client.NewClient(client.DefaultDockerHost,
crunchrun.DockerAPIVersion
, nil, nil)
if err != nil {
return err
}
if err != nil {
return err
}