clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 05:31:47 +00:00
Code Issues Packages Projects Releases Wiki 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
parent 62c3183fc8 6893689336
commit 4b587ac118
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/buildfile.go
+1 -1
View File
@@ -521,6 +521,7 @@ 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)}
defer func(cmd []string) { b.config.Cmd = cmd }(cmd)
b.config.Image = b.image
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 {
return err
}
b.config.Cmd = cmd
return nil
}