From cac3a28159d3aed1484025bd2f0153e8caa4e84a Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Thu, 13 Jun 2013 14:57:50 -0700 Subject: [PATCH] Remove run from the ADD instruction Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7 Component: engine --- components/engine/buildfile.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/components/engine/buildfile.go b/components/engine/buildfile.go index b38101c72b..3721958a93 100644 --- a/components/engine/buildfile.go +++ b/components/engine/buildfile.go @@ -220,12 +220,15 @@ func (b *buildFile) CmdAdd(args string) error { cmd := b.config.Cmd b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", orig, dest)} - cid, err := b.run() + + // Create the container and start it + c, err := b.builder.Create(b.config) if err != nil { return err } + b.tmpContainers[c.ID] = struct{}{} - container := b.runtime.Get(cid) + container := b.runtime.Get(c.ID) if container == nil { return fmt.Errorf("Error while creating the container (CmdAdd)") } @@ -244,7 +247,7 @@ func (b *buildFile) CmdAdd(args string) error { } } - if err := b.commit(cid, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil { + if err := b.commit(c.ID, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil { return err } b.config.Cmd = cmd