docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure file are cached correctly during build 

Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-01-08 12:16:23 -08:00
parent 93ff70a3e7
commit e24e9c09f8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildfile.go
View File

@ -408,14 +408,6 @@ func (b *buildFile) CmdAdd(args string) error {
sums = b.context.GetSums() sums = b.context.GetSums()
) )
// Has tarsum strips the '.' and './', we put it back for comparaison.
for file, sum := range sums {
if len(file) == 0 || file[0] != '.' && file[0] != '/' {
delete(sums, file)
sums["./"+file] = sum
}
}
if fi, err := os.Stat(path.Join(b.contextPath, origPath)); err != nil { if fi, err := os.Stat(path.Join(b.contextPath, origPath)); err != nil {
return err return err
} else if fi.IsDir() { } else if fi.IsDir() {
@ -432,7 +424,13 @@ func (b *buildFile) CmdAdd(args string) error {
hasher.Write([]byte(strings.Join(subfiles, ","))) hasher.Write([]byte(strings.Join(subfiles, ",")))
hash = "dir:" + hex.EncodeToString(hasher.Sum(nil)) hash = "dir:" + hex.EncodeToString(hasher.Sum(nil))
} else { } else {
hash = "file:" + sums[origPath] if origPath[0] == '/' && len(origPath) > 1 {
origPath = origPath[1:]
}
origPath = strings.TrimPrefix(origPath, "./")
if h, ok := sums[origPath]; ok {
hash = "file:" + h
}
} }
b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", hash, dest)} b.config.Cmd = []string{"/bin/sh", "-c", fmt.Sprintf("#(nop) ADD %s in %s", hash, dest)}
hit, err := b.probeCache() hit, err := b.probeCache()