From ce650f2d8426c76db7e58f0256ddc76694ba1d6a Mon Sep 17 00:00:00 2001 From: "blacksmith-staging[bot]" <154928735+blacksmith-staging[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 21:16:32 +0000 Subject: [PATCH 01/10] Migrate workflows to Blacksmith --- .github/workflows/.test.yml | 11 ++++------ .github/workflows/buildkit.yml | 19 ++++++++---------- .github/workflows/buildx-image.yml | 8 +++----- .github/workflows/create-patched-release.yml | 2 +- .github/workflows/dockerd.yml | 19 ++++++------------ .github/workflows/frontend.yml | 6 +++--- .github/workflows/labeler.yml | 2 +- .github/workflows/test-os.yml | 21 +++++++------------- .github/workflows/validate.yml | 9 +++------ 9 files changed, 36 insertions(+), 61 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 65f5b6d757b5..7c8a5f7f4fc1 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -36,7 +36,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: pkgs: ${{ steps.set.outputs.pkgs }} kinds: ${{ steps.set.outputs.kinds }} @@ -48,11 +48,8 @@ jobs: uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Deps run: | @@ -102,7 +99,7 @@ jobs: *.cache-to=type=gha,scope=${{ inputs.cache_scope }},repository=${{ github.repository }},ghtoken=${{ github.token }} run: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - prepare env: diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 66f573c17ebe..536e8a38937f 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -33,7 +33,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: binaries-platforms: ${{ steps.platforms.outputs.matrix }} steps: @@ -66,7 +66,7 @@ jobs: sign: ${{ github.event_name != 'pull_request' }} binaries-finalize: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - binaries steps: @@ -139,18 +139,15 @@ jobs: codecov_token: ${{ secrets.CODECOV_TOKEN }} govulncheck: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read # same as global permission security-events: write # required to write sarif report steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Run uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 @@ -166,7 +163,7 @@ jobs: sarif_file: ${{ env.DESTDIR }}/govulncheck.out image-prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.set.outputs.includes }} steps: @@ -288,7 +285,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} scout: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ github.ref == 'refs/heads/master' && github.repository == 'moby/buildkit' }} permissions: # same as global permission @@ -332,7 +329,7 @@ jobs: sarif_file: ${{ steps.scout.outputs.result-file }} release: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: # required to create GitHub release contents: write diff --git a/.github/workflows/buildx-image.yml b/.github/workflows/buildx-image.yml index 5d736bd4cf42..a8cf5a10ace3 100644 --- a/.github/workflows/buildx-image.yml +++ b/.github/workflows/buildx-image.yml @@ -36,7 +36,7 @@ env: jobs: create: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false matrix: @@ -49,10 +49,8 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Login to DockerHub if: github.event.inputs.dry-run != 'true' diff --git a/.github/workflows/create-patched-release.yml b/.github/workflows/create-patched-release.yml index d37093cfc9fb..0ddc99e999fa 100644 --- a/.github/workflows/create-patched-release.yml +++ b/.github/workflows/create-patched-release.yml @@ -22,7 +22,7 @@ permissions: jobs: create-release: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index a0bd6a77bc5f..4c89826aad48 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -19,7 +19,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Prepare @@ -39,15 +39,11 @@ jobs: core.exportVariable('DOCKER_BUILD', build); - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + uses: useblacksmith/setup-docker-builder@v1 - name: Build if: ${{ env.DOCKER_BUILD == 'true' }} - uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 + uses: useblacksmith/build-push-action@v2 with: context: ${{ env.DOCKER_VERSION }} target: binary @@ -76,7 +72,7 @@ jobs: retention-days: 1 test: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - prepare strategy: @@ -108,11 +104,8 @@ jobs: uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Download dockerd uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 2ad4957ff56f..c9cbd18cd784 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -42,7 +42,7 @@ jobs: codecov_token: ${{ secrets.CODECOV_TOKEN }} prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.set.outputs.includes }} tag: ${{ steps.set.outputs.tag }} @@ -188,7 +188,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} scout: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ github.repository == 'moby/buildkit' && github.ref == 'refs/heads/master' }} permissions: # same as global permission @@ -232,7 +232,7 @@ jobs: sarif_file: ${{ steps.scout.outputs.result-file }} release: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: startsWith(github.ref, 'refs/tags/dockerfile') permissions: # required to create GitHub release diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 3898f4ad80cd..4ffe5e8f843c 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -15,7 +15,7 @@ jobs: permissions: contents: read pull-requests: write - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Run diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 86773cd56c0c..d9095ca62aa3 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -29,7 +29,7 @@ env: jobs: build: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false matrix: @@ -44,11 +44,7 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + uses: useblacksmith/setup-docker-builder@v1 - name: Build uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 @@ -82,7 +78,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022] + os: [blacksmith-4vcpu-windows-2025] worker: - containerd pkg: @@ -107,7 +103,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: windows-2022 + - os: blacksmith-4vcpu-windows-2025 worker: containerd pkg: ./... skip-integration-tests: 1 @@ -193,7 +189,7 @@ jobs: retention-days: 1 test-freebsd-amd64: - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 needs: - build env: @@ -266,11 +262,8 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Build uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 66d78634e9b0..c7b311cc25e3 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -24,7 +24,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.matrix.outputs.includes }} steps: @@ -73,11 +73,8 @@ jobs: steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: ${{ env.SETUP_BUILDX_VERSION }} - driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} - buildkitd-flags: --debug + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Validate uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 From 84bddbc6609adaea04554a347701cfccbad1df77 Mon Sep 17 00:00:00 2001 From: "blacksmith-staging[bot]" <154928735+blacksmith-staging[bot]@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:56:25 +0000 Subject: [PATCH 02/10] Migrate workflows to Blacksmith --- .github/workflows/test-os.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index d9095ca62aa3..a1a21af951ca 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -44,7 +44,11 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Set up Docker Buildx - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Build uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 @@ -262,8 +266,11 @@ jobs: steps: - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Build uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 From b677638406ca11c4254a519e72befe6124fa6660 Mon Sep 17 00:00:00 2001 From: "blacksmith-staging[bot]" <154928735+blacksmith-staging[bot]@users.noreply.github.com> Date: Fri, 1 May 2026 19:06:14 +0000 Subject: [PATCH 03/10] Migrate workflows to Blacksmith --- .github/workflows/.test.yml | 7 +++++-- .github/workflows/buildkit.yml | 7 +++++-- .github/workflows/buildx-image.yml | 6 ++++-- .github/workflows/dockerd.yml | 15 +++++++++++---- .github/workflows/validate.yml | 7 +++++-- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 7c8a5f7f4fc1..fea5a2e09155 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -48,8 +48,11 @@ jobs: uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Deps run: | diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 536e8a38937f..033c16b790c9 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -146,8 +146,11 @@ jobs: steps: - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Run uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 diff --git a/.github/workflows/buildx-image.yml b/.github/workflows/buildx-image.yml index a8cf5a10ace3..ab12a219e058 100644 --- a/.github/workflows/buildx-image.yml +++ b/.github/workflows/buildx-image.yml @@ -49,8 +49,10 @@ jobs: steps: - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + buildkitd-flags: --debug - name: Login to DockerHub if: github.event.inputs.dry-run != 'true' diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index 4c89826aad48..ff1cfe95d0ff 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -39,11 +39,15 @@ jobs: core.exportVariable('DOCKER_BUILD', build); - name: Set up Docker Buildx - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Build if: ${{ env.DOCKER_BUILD == 'true' }} - uses: useblacksmith/build-push-action@v2 + uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 with: context: ${{ env.DOCKER_VERSION }} target: binary @@ -104,8 +108,11 @@ jobs: uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Download dockerd uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index c7b311cc25e3..404e878533ab 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -73,8 +73,11 @@ jobs: steps: - name: Set up Docker Buildx - - name: Setup Blacksmith Builder - uses: useblacksmith/setup-docker-builder@v1 + uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + with: + version: ${{ env.SETUP_BUILDX_VERSION }} + driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }} + buildkitd-flags: --debug - name: Validate uses: docker/bake-action@82490499d2e5613fcead7e128237ef0b0ea210f7 # v7.0.0 From ec59a5cdd586dc14cd1e495dd4a939eb337c9ab9 Mon Sep 17 00:00:00 2001 From: graciexia8 Date: Fri, 1 May 2026 19:07:01 +0000 Subject: [PATCH 04/10] .github/workflows: revert windows runner to windows-2022 to avoid OS version bump Co-authored-by: Codesmith Staging --- .github/workflows/test-os.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index a1a21af951ca..5f4ccfbda56a 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - os: [blacksmith-4vcpu-windows-2025] + os: [windows-2022] worker: - containerd pkg: @@ -107,7 +107,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: blacksmith-4vcpu-windows-2025 + - os: windows-2022 worker: containerd pkg: ./... skip-integration-tests: 1 From d8f2c37137cd83088a1850c35cf8ceedfa819868 Mon Sep 17 00:00:00 2001 From: "blacksmith-sh[bot]" <157653362+blacksmith-sh[bot]@users.noreply.github.com> Date: Tue, 5 May 2026 15:38:50 +0000 Subject: [PATCH 05/10] Migrate workflows to Blacksmith --- .github/workflows/test-os.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 5f4ccfbda56a..a1a21af951ca 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022] + os: [blacksmith-4vcpu-windows-2025] worker: - containerd pkg: @@ -107,7 +107,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: windows-2022 + - os: blacksmith-4vcpu-windows-2025 worker: containerd pkg: ./... skip-integration-tests: 1 From 21b339c263e154f106e84960d25fd47d81c65768 Mon Sep 17 00:00:00 2001 From: adityamaru Date: Tue, 5 May 2026 15:48:49 +0000 Subject: [PATCH 06/10] .github/workflows: revert windows runner to windows-2022 to avoid OS version bump Co-authored-by: Codesmith --- .github/workflows/test-os.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index a1a21af951ca..5f4ccfbda56a 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - os: [blacksmith-4vcpu-windows-2025] + os: [windows-2022] worker: - containerd pkg: @@ -107,7 +107,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: blacksmith-4vcpu-windows-2025 + - os: windows-2022 worker: containerd pkg: ./... skip-integration-tests: 1 From 30a257c1317c2cb0a9bba4d34ced63880f3498d2 Mon Sep 17 00:00:00 2001 From: adityamaru Date: Tue, 5 May 2026 16:06:11 +0000 Subject: [PATCH 07/10] .github/workflows: authenticate to dockerhub in test jobs to avoid pull rate limits Co-authored-by: Codesmith --- .github/workflows/.test.yml | 18 ++++++++++++++++++ .github/workflows/buildkit.yml | 2 ++ .github/workflows/frontend.yml | 2 ++ 3 files changed, 22 insertions(+) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index fea5a2e09155..8f1fe788803c 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -28,6 +28,10 @@ on: secrets: codecov_token: required: false + dockerhub_username: + required: false + dockerhub_token: + required: false env: GO_VERSION: "1.26" @@ -43,6 +47,13 @@ jobs: tags: ${{ steps.set.outputs.tags }} includes: ${{ steps.set.outputs.includes }} steps: + - + name: Login to DockerHub + if: ${{ secrets.dockerhub_token != '' }} + uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + with: + username: ${{ secrets.dockerhub_username }} + password: ${{ secrets.dockerhub_token }} - name: Set up QEMU uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 @@ -127,6 +138,13 @@ jobs: tags: ${{ fromJson(needs.prepare.outputs.tags) }} include: ${{ fromJson(needs.prepare.outputs.includes) }} steps: + - + name: Login to DockerHub + if: ${{ secrets.dockerhub_token != '' }} + uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + with: + username: ${{ secrets.dockerhub_username }} + password: ${{ secrets.dockerhub_token }} - name: Prepare env: diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 033c16b790c9..43e2836e0da8 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -137,6 +137,8 @@ jobs: typ: integration secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} + dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} + dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} govulncheck: runs-on: blacksmith-4vcpu-ubuntu-2404 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index c9cbd18cd784..3672afb3349f 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -40,6 +40,8 @@ jobs: codecov_flags: dockerfile-frontend secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} + dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} + dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} prepare: runs-on: blacksmith-4vcpu-ubuntu-2404 From b317479db46ff7b50272fc63f667b788880e166b Mon Sep 17 00:00:00 2001 From: adityamaru Date: Tue, 5 May 2026 16:09:48 +0000 Subject: [PATCH 08/10] .github/workflows: authenticate to dockerhub in test-os build job to avoid pull rate limits Co-authored-by: Codesmith --- .github/workflows/test-os.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 5f4ccfbda56a..ade3e99318ba 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -42,6 +42,13 @@ jobs: run: | platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - + name: Login to DockerHub + if: ${{ secrets.DOCKERHUB_TOKEN != '' }} + uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 From 9f7ba00481893e192f398eae3253758f1e5d21da Mon Sep 17 00:00:00 2001 From: adityamaru Date: Tue, 5 May 2026 16:21:49 +0000 Subject: [PATCH 09/10] .github/workflows: route dockerhub_token check through env to satisfy actions parser Co-authored-by: Codesmith --- .github/workflows/.test.yml | 7 +++++-- .github/workflows/test-os.yml | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 8f1fe788803c..5331c02bdadf 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -46,10 +46,12 @@ jobs: kinds: ${{ steps.set.outputs.kinds }} tags: ${{ steps.set.outputs.tags }} includes: ${{ steps.set.outputs.includes }} + env: + DOCKERHUB_TOKEN: ${{ secrets.dockerhub_token }} steps: - name: Login to DockerHub - if: ${{ secrets.dockerhub_token != '' }} + if: env.DOCKERHUB_TOKEN != '' uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: username: ${{ secrets.dockerhub_username }} @@ -120,6 +122,7 @@ jobs: TESTFLAGS: "-v --parallel=6 --timeout=30m" GOTESTSUM_FORMAT: "standard-verbose" TEST_IMAGE_BUILD: "0" + DOCKERHUB_TOKEN: ${{ secrets.dockerhub_token }} strategy: fail-fast: false matrix: @@ -140,7 +143,7 @@ jobs: steps: - name: Login to DockerHub - if: ${{ secrets.dockerhub_token != '' }} + if: env.DOCKERHUB_TOKEN != '' uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: username: ${{ secrets.dockerhub_username }} diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index ade3e99318ba..1006492de3ad 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -36,6 +36,8 @@ jobs: platform: - windows/amd64 - freebsd/amd64 + env: + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Prepare @@ -44,7 +46,7 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Login to DockerHub - if: ${{ secrets.DOCKERHUB_TOKEN != '' }} + if: env.DOCKERHUB_TOKEN != '' uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} From 17d6f3114a37423b72b935515e9af5eb6579b633 Mon Sep 17 00:00:00 2001 From: "blacksmith-sh[bot]" <157653362+blacksmith-sh[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 14:51:14 +0000 Subject: [PATCH 10/10] Migrate workflows to Blacksmith --- .github/workflows/.test.yml | 21 --------------------- .github/workflows/buildkit.yml | 2 -- .github/workflows/frontend.yml | 2 -- .github/workflows/test-os.yml | 13 ++----------- 4 files changed, 2 insertions(+), 36 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 5331c02bdadf..fea5a2e09155 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -28,10 +28,6 @@ on: secrets: codecov_token: required: false - dockerhub_username: - required: false - dockerhub_token: - required: false env: GO_VERSION: "1.26" @@ -46,16 +42,7 @@ jobs: kinds: ${{ steps.set.outputs.kinds }} tags: ${{ steps.set.outputs.tags }} includes: ${{ steps.set.outputs.includes }} - env: - DOCKERHUB_TOKEN: ${{ secrets.dockerhub_token }} steps: - - - name: Login to DockerHub - if: env.DOCKERHUB_TOKEN != '' - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 - with: - username: ${{ secrets.dockerhub_username }} - password: ${{ secrets.dockerhub_token }} - name: Set up QEMU uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 @@ -122,7 +109,6 @@ jobs: TESTFLAGS: "-v --parallel=6 --timeout=30m" GOTESTSUM_FORMAT: "standard-verbose" TEST_IMAGE_BUILD: "0" - DOCKERHUB_TOKEN: ${{ secrets.dockerhub_token }} strategy: fail-fast: false matrix: @@ -141,13 +127,6 @@ jobs: tags: ${{ fromJson(needs.prepare.outputs.tags) }} include: ${{ fromJson(needs.prepare.outputs.includes) }} steps: - - - name: Login to DockerHub - if: env.DOCKERHUB_TOKEN != '' - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 - with: - username: ${{ secrets.dockerhub_username }} - password: ${{ secrets.dockerhub_token }} - name: Prepare env: diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 43e2836e0da8..033c16b790c9 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -137,8 +137,6 @@ jobs: typ: integration secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} - dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} - dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} govulncheck: runs-on: blacksmith-4vcpu-ubuntu-2404 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 3672afb3349f..c9cbd18cd784 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -40,8 +40,6 @@ jobs: codecov_flags: dockerfile-frontend secrets: codecov_token: ${{ secrets.CODECOV_TOKEN }} - dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }} - dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }} prepare: runs-on: blacksmith-4vcpu-ubuntu-2404 diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 1006492de3ad..a1a21af951ca 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -36,21 +36,12 @@ jobs: platform: - windows/amd64 - freebsd/amd64 - env: - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Prepare run: | platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Login to DockerHub - if: env.DOCKERHUB_TOKEN != '' - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 @@ -91,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022] + os: [blacksmith-4vcpu-windows-2025] worker: - containerd pkg: @@ -116,7 +107,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: windows-2022 + - os: blacksmith-4vcpu-windows-2025 worker: containerd pkg: ./... skip-integration-tests: 1