Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v0.6 backport] contenthash: ignore system and security xattrs in calculation #1517

Merged
merged 2 commits into from
Jul 16, 2020
Merged

[v0.6 backport] contenthash: ignore system and security xattrs in calculation #1517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dea9fb
contenthash: ignore system and security xattrs in calculation
tonistiigi Mar 4, 2020
e61ca9d
contenthash: allow security.capability in cache checksum
tonistiigi Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cache/contenthash/tarsum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"io"
"sort"
"strconv"
"strings"
)

// WriteV1TarsumHeaders writes a tar header to a writer in V1 tarsum format.
Expand Down Expand Up @@ -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 k == "security.capability" || !strings.HasPrefix(k, "security.") && !strings.HasPrefix(k, "system.") {
xAttrKeys = append(xAttrKeys, k)
}
}
sort.Strings(xAttrKeys)

Expand Down