chore: merge upstream moby/buildkit v0.13.2

.github/workflows/.test.yml

@@ -63,11 +63,7 @@ jobs:
       -
         name: Set outputs
         id: set
-<<<<<<< HEAD
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410  # v6.4.1
-=======
-        uses: actions/github-script@v7
->>>>>>> v0.13.2
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b  # v7.1.0
         with:
           script: |
             const yaml = require('js-yaml');
@@ -136,8 +132,6 @@ jobs:
             echo "${l?}" >> $GITHUB_ENV
           done
           echo "TEST_REPORT_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.kind }}-${{ matrix.worker }}-${{ matrix.tags }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
-<<<<<<< HEAD
-=======
           testFlags="${{ env.TESTFLAGS }}"
           if [ -n "${{ matrix.tags }}" ]; then
             testFlags="${testFlags} --tags=${{ matrix.tags }}"
@@ -146,7 +140,6 @@ jobs:
             testFlags="${testFlags} --run=//worker=${{ matrix.worker }}$"
           fi
           echo "TESTFLAGS=${testFlags}" >> $GITHUB_ENV
->>>>>>> v0.13.2
       -
         name: Checkout
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
@@ -177,17 +170,6 @@ jobs:
       -
         name: Test
         run: |
-<<<<<<< HEAD
-          export TEST_REPORT_SUFFIX=-${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.kind }}-${{ matrix.worker }}-${{ matrix.tags }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')
-          if [ -n "${{ matrix.tags }}" ]; then
-            TESTFLAGS="${TESTFLAGS} --tags=${{ matrix.tags }}"
-          fi
-          if [ -n "${{ matrix.worker }}" ]; then
-            export TESTFLAGS="${TESTFLAGS} --run=//worker=${{ matrix.worker }}$"
-          fi
-          echo TESTFLAGS=$TESTFLAGS
-=======
->>>>>>> v0.13.2
           ./hack/test ${{ matrix.kind }}
         env:
           TEST_REPORT_SUFFIX: -${{ env.TEST_REPORT_NAME }}
@@ -199,41 +181,25 @@ jobs:
       -
         name: Send to Codecov
         if: always()
-<<<<<<< HEAD
-        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457  # v3.1.6
-=======
-        uses: codecov/codecov-action@v4
->>>>>>> v0.13.2
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
         with:
           directory: ./bin/testreports
           flags: ${{ matrix.codecov_flags }}
           token: ${{ secrets.CODECOV_TOKEN }}  # used to upload coverage reports: https://github.com/moby/buildkit/pull/4660#issue-2142122533
       -
         name: Generate annotations
         if: always()
-<<<<<<< HEAD
         uses: crazy-max/.github/.github/actions/gotest-annotations@f91220cba053bd54299ba645a599ee8ed436f222  # v1.11.0
-=======
-        uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
->>>>>>> v0.13.2
         with:
           directory: ./bin/testreports
       -
         name: Upload test reports
         if: always()
-<<<<<<< HEAD
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
-        with:
-          name: test-reports-${{ env.TEST_REPORT_NAME }}
-          path: ./bin/testreports
-          overwrite: true
-=======
-        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ env.TEST_REPORT_NAME }}
           path: ./bin/testreports
           retention-days: 1
->>>>>>> v0.13.2
       -
         name: Dump context
         if: failure()

.github/workflows/buildkit.yml

@@ -109,11 +109,7 @@ jobs:
           # CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }}
       -
         name: Upload artifacts
-<<<<<<< HEAD
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
-=======
-        uses: actions/upload-artifact@v4
->>>>>>> v0.13.2
         with:
           name: buildkit-${{ env.PLATFORM_PAIR }}
           path: ${{ env.DESTDIR }}/*
@@ -203,11 +199,7 @@ jobs:
     steps:
       -
         name: Download artifacts
-<<<<<<< HEAD
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0  # v5.0.0
-=======
-        uses: actions/download-artifact@v4
->>>>>>> v0.13.2
         with:
           path: ${{ env.DESTDIR }}
           pattern: buildkit-*

.github/workflows/dockerd.yml

@@ -20,11 +20,7 @@ jobs:
     steps:
       -
         name: Prepare
-<<<<<<< HEAD
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410  # v6.4.1
-=======
-        uses: actions/github-script@v7
->>>>>>> v0.13.2
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b  # v7.1.0
         with:
           script: |
             const version = `${{ inputs.version }}` || '25.0.2';
@@ -67,11 +63,7 @@ jobs:
           wget -qO- "https://download.docker.com/linux/static/stable/x86_64/docker-${{ env.DOCKER_VERSION }}.tgz" | tar xvz --strip 1
       -
         name: Upload dockerd
-<<<<<<< HEAD
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
-=======
-        uses: actions/upload-artifact@v4
->>>>>>> v0.13.2
         with:
           name: dockerd
           path: /tmp/moby/dockerd
@@ -118,11 +110,7 @@ jobs:
           buildkitd-flags: --debug
       -
         name: Download dockerd
-<<<<<<< HEAD
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0  # v5.0.0
-=======
-        uses: actions/download-artifact@v4
->>>>>>> v0.13.2
         with:
           name: dockerd
           path: ./build/

.github/workflows/test-os.yml

@@ -33,69 +33,10 @@ jobs:
           - freebsd/amd64
     steps:
       -
-<<<<<<< HEAD
-        name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
-      -
-        name: Set up Go
-        uses: actions/setup-go@7b8cf10d4e4a01d4992d18a89f4d7dc5a3e6d6f4  # v4.3.0
-        with:
-          go-version: "${{ env.GO_VERSION }}"
-      -
-        name: Install gotestsum
-        run: |
-          go install gotest.tools/gotestsum@${{ env.GOTESTSUM_VERSION }}
-      -
-        name: Test
-        env:
-          TMPDIR: ${{ runner.temp }}
-          SKIP_INTEGRATION_TESTS: 1
-        run: |
-          mkdir -p ./bin/testreports
-          gotestsum \
-            --jsonfile="./bin/testreports/go-test-report.json" \
-            --junitfile="./bin/testreports/junit-report.xml" \
-            --packages="./..." \
-            -- \
-              "-mod=vendor" \
-              "-coverprofile" "./bin/testreports/coverage.txt" \
-              "-covermode" "atomic" ${TESTFLAGS}
-        shell: bash
-      -
-        name: Send to Codecov
-        if: always()
-        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457  # v3.1.6
-        with:
-          directory: ./bin/testreports
-          env_vars: RUNNER_OS
-          flags: unit
-      -
-        name: Generate annotations
-        if: always()
-        uses: crazy-max/.github/.github/actions/gotest-annotations@f91220cba053bd54299ba645a599ee8ed436f222  # v1.11.0
-        with:
-          directory: ./bin/testreports
-      -
-        name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
-        with:
-          name: test-reports
-          path: ./bin/testreports
-      -
-        name: Dump context
-        if: failure()
-        uses: crazy-max/ghaction-dump-context@4d9eeaf15dd59aa4346919ea84a84ccf514b4db8  # v3.1.0
-
-  build-freebsd-amd64:
-    runs-on: ubuntu-22.04
-    steps:
-=======
         name: Prepare
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
->>>>>>> v0.13.2
       -
         name: Checkout
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
@@ -118,11 +59,7 @@ jobs:
           tree -nh ${{ env.DESTDIR }}
       -
         name: Upload artifacts
-<<<<<<< HEAD
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
-=======
-        uses: actions/upload-artifact@v4
->>>>>>> v0.13.2
         with:
           name: buildkit-${{ env.PLATFORM_PAIR }}
           path: ${{ env.DESTDIR }}/*
@@ -165,19 +102,19 @@ jobs:
         shell: bash
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
       -
         name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v3
+        uses: crazy-max/ghaction-github-runtime@3cb05d89e1f492524af3d41a1c98c83bc3025124  # v3.1.0
       -
         name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34  # v5.3.0
         with:
           go-version: "${{ env.GO_VERSION }}"
           cache: false
       -
         name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806  # v4.1.9
         with:
           name: buildkit-windows-amd64
           path: ${{ github.workspace }}\bin
@@ -204,7 +141,7 @@ jobs:
       -
         name: Send to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238  # v4.6.0
         with:
           directory: ./bin/testreports
           env_vars: RUNNER_OS
@@ -213,21 +150,21 @@ jobs:
       -
         name: Generate annotations
         if: always()
-        uses: crazy-max/.github/.github/actions/gotest-annotations@fa6141aedf23596fb8bdcceab9cce8dadaa31bd9
+        uses: crazy-max/.github/.github/actions/gotest-annotations@f91220cba053bd54299ba645a599ee8ed436f222  # v1.11.0
         with:
           directory: ./bin/testreports
       -
         name: Upload test reports
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02  # v4.6.2
         with:
           name: test-reports-${{ env.TEST_REPORT_NAME }}
           path: ./bin/testreports
           retention-days: 1
       -
         name: Dump context
         if: failure()
-        uses: crazy-max/ghaction-dump-context@v2
+        uses: crazy-max/ghaction-dump-context@4d9eeaf15dd59aa4346919ea84a84ccf514b4db8  # v3.1.0
 
   test-freebsd-amd64:
     if: false  # TODO(jhorsts): Skip freebsd. Fails. Not supported by EarthBuild. Revisit after upstream merge?
@@ -243,21 +180,13 @@ jobs:
         uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
       -
         name: Download artifacts
-<<<<<<< HEAD
         uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0  # v5.0.0
-=======
-        uses: actions/download-artifact@v4
->>>>>>> v0.13.2
         with:
           name: buildkit-freebsd-amd64
           path: ${{ env.DESTDIR }}
       -
         name: Cache Vagrant boxes
-<<<<<<< HEAD
-        uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c  # v3.5.0
-=======
-        uses: actions/cache@v4
->>>>>>> v0.13.2
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
         with:
           path: ~/.vagrant.d/boxes
           key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd13') }}

.github/workflows/validate.yml

@@ -73,20 +73,20 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262  # v4.4.0
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130  # v3.7.0
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f  # v3.12.0
         with:
           version: ${{ env.SETUP_BUILDX_VERSION }}
           driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
           buildkitd-flags: --debug
       -
         name: Validate
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c  # v6.9.0
         with:
           targets: validate-archutil
           set: |

Dockerfile

@@ -1,11 +1,7 @@
 # syntax=docker/dockerfile-upstream:master
 
 ARG RUNC_VERSION=v1.1.12
-<<<<<<< HEAD
-ARG CONTAINERD_VERSION=v1.7.7
-=======
 ARG CONTAINERD_VERSION=v1.7.11
->>>>>>> v0.13.2
 # containerd v1.6 for integration tests
 ARG CONTAINERD_ALT_VERSION_16=v1.6.24
 ARG REGISTRY_VERSION=v2.8.3
@@ -14,23 +10,15 @@
 ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
 ARG NERDCTL_VERSION=v1.6.2
 ARG DNSNAME_VERSION=v1.3.1
-<<<<<<< HEAD
 ARG NYDUS_VERSION=v2.2.4
-=======
-ARG NYDUS_VERSION=v2.1.6
->>>>>>> origin/main
 ARG SILO_VERSION=RELEASE.2026-09-16T00-00-00Z
 ARG AZURITE_VERSION=3.18.0
 ARG GOTESTSUM_VERSION=v1.9.0
 ARG DELVE_VERSION=v1.21.0
 
 ARG GO_VERSION=1.21
 ARG ALPINE_VERSION=3.19
-<<<<<<< HEAD
-ARG XX_VERSION=1.3.0
-=======
 ARG XX_VERSION=1.4.0
->>>>>>> v0.13.2
 ARG BUILDKIT_DEBUG
 
 # silo for s3 integration tests
@@ -231,11 +219,8 @@
 COPY --link --from=releaser /out/ /
 
 FROM alpinebase AS buildkit-export
-<<<<<<< HEAD
-RUN apk add --no-cache fuse3 git openssh pigz xz iptables iptables-legacy ip6tables \
-=======
 RUN apk add --no-cache fuse3 git openssh pigz xz iptables ip6tables \
->>>>>>> v0.13.2
+  iptables-legacy \
   && ln -s fusermount3 /usr/bin/fusermount
 COPY --link examples/buildctl-daemonless/buildctl-daemonless.sh /usr/bin/
 VOLUME /var/lib/buildkit
@@ -273,7 +258,7 @@
 EOT
 
 # containerd v1.6 for integration tests
 FROM containerd-base as containerd-alt-16
 ARG CONTAINERD_ALT_VERSION_16
 RUN --mount=from=containerd-src,src=/usr/src/containerd,rw \
     --mount=target=/root/.cache,type=cache <<EOT