kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #5436 from hobofan/master

Browse source 
reapply Cmd value even if CmdAdd returns early
This commit is contained in:
Victor Vieux 2014-05-16 12:45:23 -07:00
commit 4b587ac118
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/buildfile.go
View file

@ -521,6 +521,7 @@ func (b *buildFile) CmdAdd(args string) error {
cmd := b.config.Cmd cmd := b.config.Cmd
b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", orig, dest)} b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", orig, dest)}
defer func(cmd []string) { b.config.Cmd = cmd }(cmd)
b.config.Image = b.image b.config.Image = b.image
var ( var (
@ -656,7 +657,6 @@ func (b *buildFile) CmdAdd(args string) error {
if err := b.commit(container.ID, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil { if err := b.commit(container.ID, cmd, fmt.Sprintf("ADD %s in %s", orig, dest)); err != nil {
return err return err
} }
b.config.Cmd = cmd
return nil return nil
} }