Merge pull request #1393 from tonistiigi/xattr-hash

contenthash: ignore system and security xattrs in calculation
moby · Mar 4, 2020 · a276ba7 · a276ba7
2 parents 09900f3 + 81e7113
commit a276ba7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cache/contenthash/tarsum.go b/cache/contenthash/tarsum.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"sort"
 	"strconv"
+	"strings"
 )
 
 // WriteV1TarsumHeaders writes a tar header to a writer in V1 tarsum format.
@@ -38,7 +39,9 @@ func v1TarHeaderSelect(h *tar.Header) (orderedHeaders [][2]string) {
 	// Get extended attributes.
 	xAttrKeys := make([]string, len(h.Xattrs))
 	for k := range h.Xattrs {
-		xAttrKeys = append(xAttrKeys, k)
+		if !strings.HasPrefix(k, "security.") && !strings.HasPrefix(k, "system.") {
+			xAttrKeys = append(xAttrKeys, k)
+		}
 	}
 	sort.Strings(xAttrKeys)