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

reapply Cmd value even if CmdAdd returns early

Browse source 
Docker-DCO-1.1-Signed-off-by: Maximilian Goisser <goisser94@gmail.com> (github: hobofan)
This commit is contained in:
Hobofan 2014-04-28 18:30:43 +02:00
parent 4155874443
commit 6893689336
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

@ -482,6 +482,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 (
@ -617,7 +618,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
} }