Treat unix sockets as regular files

This fix is similar to the fix in moby#1144; but was hit in a different code path. Signed-off-by: Alex Couture-Beil <[email protected]>
alexcb · Jul 23, 2020 · 66c656a · 66c656a
1 parent ed029cf
commit 66c656a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cache/contenthash/filehash.go b/cache/contenthash/filehash.go
@@ -33,6 +33,9 @@ func NewFileHash(path string, fi os.FileInfo) (hash.Hash, error) {
 		stat.Mode = stat.Mode | 0777
 	}
 
+	// Clear the socket bit since archive/tar.FileInfoHeader does not handle it
+	stat.Mode &^= uint32(os.ModeSocket)
+
 	if err := setUnixOpt(path, fi, stat); err != nil {
 		return nil, err
 	}