Skip to content

vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde#42424

Merged
thaJeztah merged 2 commits into
moby:masterfrom
thaJeztah:bump_buildkit2
Jun 1, 2021
Merged

vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde#42424
thaJeztah merged 2 commits into
moby:masterfrom
thaJeztah:bump_buildkit2

Conversation

@thaJeztah

@thaJeztah thaJeztah commented May 26, 2021

Copy link
Copy Markdown
Member

vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde

full diff: moby/buildkit@v0.8.3...v0.8.3-3-g244e8cde

  • Transform relative mountpoints for exec mounts in the executor
  • Add test for handling relative mountpoints

vendor: github.com/moby/buildkit v0.8.3

full diff: moby/buildkit@v0.8.2...v0.8.3

  • vendor containerd (required for rootless overlayfs on kernel 5.11)
    • not included to avoid depending on a fork
  • Add retry on image push 5xx errors
  • contenthash: include basename in content checksum for wildcards
  • Fix missing mounts in execOp cache map
  • Add regression test for run cache not considering mounts
  • Add hack to preserve Dockerfile RUN cache compatibility after mount cache bugfix

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

full diff: moby/buildkit@v0.8.2...v0.8.3

- vendor containerd (required for rootless overlayfs on kernel 5.11)
    - not included to avoid depending on a fork
- Add retry on image push 5xx errors
- contenthash: include basename in content checksum for wildcards
- Fix missing mounts in execOp cache map
- Add regression test for run cache not considering mounts
- Add hack to preserve Dockerfile RUN cache compatibility after mount cache bugfix

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah

Copy link
Copy Markdown
Member Author

@tonistiigi @AkihiroSuda PTAL

I didn't take the containerd vendoring changes to avoid having to depend on a fork; is there a way we can use (e.g.) a tagged version of containerd with the needed fixes?

// containerd: Forked from 0edc412565dcc6e3d6125ff9e4b009ad4b89c638 (20201117) with:
// - `Adjust overlay tests to expect "index=off"` (#4719, for ease of cherry-picking #5076)
// - `overlay: support "userxattr" option (kernel 5.11)` (#5076)
// - `docker: avoid concurrent map access panic` (#4855)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this related to #42422 ?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

@AkihiroSuda

Copy link
Copy Markdown
Member

For v21.xx, can we rather vendor the master branch?

@thaJeztah

Copy link
Copy Markdown
Member Author

I think it's ok to update after that; thought we'd take this one (possibly cherry-pick for 20.10)

I need to look at updating runc etc (had some WIP pr's for that) for master

@thaJeztah
thaJeztah requested a review from tonistiigi May 27, 2021 20:46
@tonistiigi

Copy link
Copy Markdown
Member

Yeah, we should pick v0.8.3 + moby/buildkit#2137 directly to 20.10 .

full diff: moby/buildkit@v0.8.3...v0.8.3-3-g244e8cde

- Transform relative mountpoints for exec mounts in the executor
- Add test for handling relative mountpoints

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title vendor: github.com/moby/buildkit v0.8.3 vendor: github.com/moby/buildkit v0.8.3-3-g244e8cde May 31, 2021
@thaJeztah

Copy link
Copy Markdown
Member Author

added moby/buildkit#2137

and opened #42448 for 20.10

@thaJeztah
thaJeztah merged commit 7c6a948 into moby:master Jun 1, 2021
@thaJeztah
thaJeztah deleted the bump_buildkit2 branch June 1, 2021 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants