Skip to content

chore: merge upstream moby/buildkit v0.13.2 with unresolved conflicts - #31

Closed
janishorsts wants to merge 522 commits into
mainfrom
chore-merge-v0.13.2-unresolved
Closed

janishorsts wants to merge 522 commits into
mainfrom
chore-merge-v0.13.2-unresolved

Conversation

@janishorsts

Copy link
Copy Markdown

First PR in stack: full merge of upstream moby/buildkit v0.13.2 with unresolved conflicts.

leandrosansilva and others added 30 commits January 29, 2024 16:30
Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
It will need to be removed in a follow up PR.

Signed-off-by: Leandro Santiago <leandrosansilva@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
vendor: bump github.com/aws/aws-sdk-go-v2 deps
This file mistakenly included an output index field. This field never
seemed to exist, the output index is actually part of the record digest
(see rootKey).

Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Nobi <nobi@nobidev.com>
Fix missing chown/chmod when using parents flag with ADD/COPY command
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit ef536af15b2d351b8f0459022decc2a4955b1cb2)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit d293ec3208f87fefab7a1caadffa3f3f50604796)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 432ece72ae124ce8a29ced6854a08206f09f3a73)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 4e2569e796aae398648082689d70ca1d4f4f74a8)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 838635998dcae34bbde59e3eab129ab85bd37bef)
Running interactive container APIs was done by giving
the gateway implementation access to worker controller
directly, but it should be passed with a build job instead.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 0971dffaab93d91e51af984b44c745b35b3c5b4d)
Ensure interactive calls validate same conditions that
the build requests do. Refactor of the build side is to ensure
we use the same validation function for both cases. There
was no validation issue with the LLB validation.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit d1970522d7145be5f4a1f1a028b1910bb527126c)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 96ccaec09c51176a6d954fd7c4ce57d519bae1b2)
While submount paths were already validated there are some
cases where the parent mount may not be immutable while the
submount is created.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2529ec4121bcd8c35bcd96218083da175c2e5b77)
Brings in the fix for GHSA-xr7r-f8xq-vfvv

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
…ments

llbsolver: make sure interactive container API validates entitlements
executor: recheck mount stub path within root after container run
exec: add extra validation for submount sources
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
tonistiigi and others added 19 commits March 18, 2024 11:19
This method is needed by GHA cache backend to detect
if Github deletes blobs from the cache because of
storage caps. It got missing when Info() support was
added.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 5a8856d)
URLs that look like `./path/to/file` and `../path/to/file` definitely
aren't git URLs - so we should bail out early.

This was causing a weird issue where if you copied `./.git` this would
be detected as a valid url parsing with `host = "."` and `path = "/git"`.
The fix for this is to make sure that for these explicit file-like
paths, we *never* parse them as url-refs.

Also some tests to make sure this doesn't break again!

Signed-off-by: Justin Chadwell <me@jedevc.com>
(cherry picked from commit 95ca25e)
The source path changed in v0.13 and there are reports
that new path can cause error on starting a container. While
this is investigated, check for missing path and make
mounting optional like it was in v0.12.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 33b347a)
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
(cherry picked from commit b586a6a)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Fix issue 4746

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 5f1202c)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
The archive reader was not fully consumed on computating the diffID.

Fix issue 4805

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit e315f0e)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.23.0.
- [Commits](golang/net@v0.18.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit c2be8a4)
There was no merge conflict during cherry-picking, but
an additional `go mod tidy` had to be executed.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit eb22207)
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
(cherry picked from commit df5ad9c)
Initially we had the GC Policy for Windows use only
2 GB (2e9 bytes) of disk space and this was limiting
for some build scenarios that need more than that,
especially ServerCore images.

This commit makes the policy to use percentages
as it is on Linux. Also going for 20%, double that
of Linux, since Windows images tend to be larger.

fixes #4858 docker/buildx#2411

Also, refactors the diskSize logic to simplify
it by bringing the `d.AsByte` function back from
platform specific files to `gcpolicy.go`.

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
(cherry picked from commit a5f9e42)
Full diff: https://github.com/tonistiigi/fsutil/compare/7525a1af2bb5..497d33b

Summary changes:
- tonistiigi/fsutil#195
  receive: ensure callback errors are propagated
- tonistiigi/fsutil#196
  Fix file transfers from windows to linux
  fixes #4741
- tonistiigi/fsutil#197
  recv: translate linkname to wire format

Signed-off-by: Anthony Nandaa <profnandaa@gmail.com>
(cherry picked from commit 64ea9da)
Brings in fix for hardlink filters.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit f67b96c)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 68671bc)
@coderabbitai

coderabbitai Bot commented Oct 1, 2026 •

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Oct 1, 2026 •

Copy link
Copy Markdown

🎉 Are we earthbuild yet?

Great progress! You've reduced "earthly" occurrences by 8 (3.65%)

📈 Overall Progress

Branch Total Count
main 219
This PR 211
Difference -8 (3.65%)

📁 Changes by file type:

File Type Change
Go files (.go) ✅ -8
Documentation (.md) ➖ No change
Earthfiles ➖ No change

Keep up the great work migrating from Earthly to Earthbuild! 🚀

💡 Tips for finding more occurrences

Run locally to see detailed breakdown:

./.github/scripts/count-earthly.sh

Note that the goal is not to reach 0.
There is anticipated to be at least some occurences of earthly in the source code due to backwards compatibility with config files and language constructs.

@socket-security

socket-security Bot commented Oct 1, 2026 •

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Addedpypi/​codespell@​2.2.69810010010070

View full report

@janishorsts
janishorsts added this pull request to stack #34 October 1, 2026 17:31
@janishorsts
janishorsts removed this pull request from stack #34 October 2, 2026 10:42
@janishorsts
janishorsts changed the base branch from chore-prune-unused to main October 2, 2026 10:43
@janishorsts
janishorsts added this pull request to stack #39 October 2, 2026 10:43
test:
runs-on: ${{ matrix.os }}
build:
runs-on: ubuntu-22.04
Comment on lines +69 to +93
runs-on: ubuntu-22.04
# TODO: enable when binutils-loongarch64-linux-gnu pkg is available for aarch64 arch
# https://github.com/moby/buildkit/pull/4392#issuecomment-1938223235
if: false
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: ${{ env.SETUP_BUILDX_VERSION }}
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
buildkitd-flags: --debug
-
name: Validate
uses: docker/bake-action@v4
with:
targets: validate-archutil
set: |
*.platform=linux/arm64
@janishorsts janishorsts closed this Oct 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.