From 97215ca384373bfa65c08dc05454c14cef493d30 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 24 Apr 2013 12:31:20 -0700 Subject: [PATCH] make builder.Run public it now runs only given arguments without sh -c --- builder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder.go b/builder.go index 1b54df81b..cbc8711aa 100644 --- a/builder.go +++ b/builder.go @@ -17,9 +17,9 @@ func NewBuilder(runtime *Runtime) *Builder { } } -func (builder *Builder) run(image *Image, cmd string) (*Container, error) { +func (builder *Builder) Run(image *Image, cmd ...string) (*Container, error) { // FIXME: pass a NopWriter instead of nil - config, err := ParseRun([]string{"-d", image.Id, "/bin/sh", "-c", cmd}, nil, builder.runtime.capabilities) + config, err := ParseRun(append([]string{"-d", image.Id}, cmd...), nil, builder.runtime.capabilities) if config.Image == "" { return nil, fmt.Errorf("Image not specified") } @@ -94,7 +94,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) error { } // Create the container and start it - c, err := builder.run(image, tmp[1]) + c, err := builder.Run(image, "/bin/sh", "-c", tmp[1]) if err != nil { return err }