Skip to content

Commit

Permalink
merge branch 'pr-354'
Browse files Browse the repository at this point in the history
Tycho Andersen (1):
  layer: ignore overlay.* xattrs

LGTMs: @tych0 @cyphar
Closes #354
  • Loading branch information
cyphar committed Mar 6, 2021
2 parents 64c4898 + b171df2 commit 130e11a
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions oci/layer/tar_generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@ var ignoreXattrs = map[string]struct{}{
// In order to support overlayfs whiteout mode, we shouldn't un-set
// this after we've set it when writing out the whiteouts.
"trusted.overlay.opaque": {},

// We don't want to these xattrs into the image, because they're only
// relevant based on how the build overlay is constructed and will not
// be true on the target system once the image is unpacked (e.g. inodes
// might be different, impure status won't be true, etc.).
"trusted.overlay.redirect": {},
"trusted.overlay.origin": {},
"trusted.overlay.impure": {},
"trusted.overlay.nlink": {},
"trusted.overlay.upper": {},
"trusted.overlay.metacopy": {},
}

func init() {
Expand Down

0 comments on commit 130e11a

Please sign in to comment.