beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove run from the ADD instruction

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-06-13 14:57:50 -07:00
parent b38c6929be
commit d0084ce5f2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
buildfile.go
View file

@ -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