Fix Malformed history layer - missing Sprintf in append of shell in Builder run config

danf · Tibor Vass · commit a55b4462d487 · 2016-06-30T16:47:52.000-07:00
Signed-off-by: Dan Feldman <danf@jfrog.com> (cherry picked from commit 29b6a69)
diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go
@@ -172,7 +172,7 @@ func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalD
 	}
 
 	cmd := b.runConfig.Cmd
-	b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), "#(nop) %s %s in %s ", cmdName, srcHash, dest))
+	b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), fmt.Sprintf("#(nop) %s %s in %s ", cmdName, srcHash, dest)))
 	defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
 
 	if hit, err := b.probeCache(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalD`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`cmd := b.runConfig.Cmd`
`175`		`- b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), "#(nop) %s %s in %s ", cmdName, srcHash, dest))`
	`175`	`+ b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), fmt.Sprintf("#(nop) %s %s in %s ", cmdName, srcHash, dest)))`
`176`	`176`	`defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)`
`177`	`177`
`178`	`178`	`if hit, err := b.probeCache(); err != nil {`