clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5951 from vieux/pr5919

Browse Source 
Fix remote add cache
This commit is contained in:
Victor Vieux
2014-05-20 14:33:05 -07:00
parent 70d35b9d39 03a109e446
commit 240fad4974
4 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/buildfile.go
+11 -1
View File
@@ -16,11 +16,13 @@ import (
"regexp"
"sort"
"strings"
"syscall"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/daemon"
"github.com/dotcloud/docker/nat"
"github.com/dotcloud/docker/pkg/symlink"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/registry"
"github.com/dotcloud/docker/runconfig"
"github.com/dotcloud/docker/utils"
@@ -563,6 +565,11 @@ func (b *buildFile) CmdAdd(args string) error {
}
tmpFile.Close()
// Remove the mtime of the newly created tmp file
if err := system.UtimesNano(tmpFileName, make([]syscall.Timespec, 2)); err != nil {
return err
}
origPath = path.Join(filepath.Base(tmpDirName), filepath.Base(tmpFileName))
// Process the checksum
@@ -570,7 +577,10 @@ func (b *buildFile) CmdAdd(args string) error {
if err != nil {
return err
}
tarSum := utils.TarSum{Reader: r, DisableCompression: true}
tarSum := &utils.TarSum{Reader: r, DisableCompression: true}
if _, err := io.Copy(ioutil.Discard, tarSum); err != nil {
return err
}
remoteHash = tarSum.Sum(nil)
r.Close()