clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 04:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

make builder.Run public it now runs only given arguments without sh -c

Browse Source
This commit is contained in:
Guillaume J. Charmes
2013-05-06 16:00:30 -07:00
parent b8f66c0d14
commit 97215ca384
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder.go
+3 -3
View File
@@ -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
}