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.11.4 cherry picks #3673

Merged
merged 3 commits into from
Feb 28, 2023
Merged

v0.11.4 cherry picks #3673

merged 3 commits into from
Feb 28, 2023

Conversation

tonistiigi
Copy link
Member

@imeoer @tonistiigi
fix a possible panic on cache
99aaa10 
```
newDesc.Annotations = nil
for _, k := range addAnnotations {
  newDesc.Annotations[k] = desc.Annotations[k]
}
```

The codes may cause buildkitd panic: assignment to entry in nil map

Signed-off-by: Yan Song <imeoer@linux.alibaba.com>
(cherry picked from commit 39bd8c6)
@sipsma @tonistiigi
Fix buildkitd panic when frontend input is nil.
17401b5 
Signed-off-by: Erik Sipsma <erik@sipsma.dev>
(cherry picked from commit 2e6d0bf)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@sipsma @tonistiigi
diffapply: do chown before xattrs
97b37f9 
Chown will result file capabilities getting reset, so it should be done
before setting xattrs to ensure they are retained.

Signed-off-by: Erik Sipsma <erik@sipsma.dev>
(cherry picked from commit 0a36f1a)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@crazy-max crazy-max merged commit 2590f95 into moby:v0.11 Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crazy-max crazy-max crazy-max approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tonistiigi @crazy-max @imeoer @sipsma