diff --git a/.github/actions/setup-buildx/action.yml b/.github/actions/setup-buildx/action.yml index 41210035f..3e1d54521 100644 --- a/.github/actions/setup-buildx/action.yml +++ b/.github/actions/setup-buildx/action.yml @@ -1,23 +1,11 @@ name: Setup Docker Buildx description: > - Create a Docker Buildx builder. Two modes: - * driver=remote (default) — multi-arch builder against in-cluster BuildKit - pods. Requires EKS connectivity. Behaviour unchanged from prior versions. - * driver=local — single-node buildx on the local docker-container driver. - Pair with cache-to/cache-from=type=gha on build steps for persistence. - Works on nv-gha-runners; no EKS needed. + Create a Docker Buildx builder on the local docker-container driver. Pair + with cache-to/cache-from=type=gha on build steps for persistence. Works on + nv-gha-runners; no EKS BuildKit service is required. Cleanup is automatic when the job finishes (docker/setup-buildx-action default). inputs: - driver: - description: "buildx driver: 'remote' or 'local'" - default: remote - amd64-endpoint: - description: BuildKit endpoint for linux/amd64 (remote driver only) - default: tcp://buildkit-amd64.buildkit:1234 - arm64-endpoint: - description: BuildKit endpoint for linux/arm64 (remote driver only) - default: tcp://buildkit-arm64.buildkit:1234 name: description: Builder instance name default: openshell @@ -34,21 +22,7 @@ inputs: runs: using: composite steps: - - name: Set up Docker Buildx (remote) - if: inputs.driver == 'remote' - uses: docker/setup-buildx-action@v3 - with: - name: ${{ inputs.name }} - driver: remote - endpoint: ${{ inputs.amd64-endpoint }} - platforms: linux/amd64 - append: | - - endpoint: ${{ inputs.arm64-endpoint }} - platforms: linux/arm64 - buildkitd-config: ${{ inputs.buildkitd-config }} - - name: Set up Docker Buildx (local) - if: inputs.driver == 'local' uses: docker/setup-buildx-action@v3 with: name: ${{ inputs.name }} diff --git a/.github/workflows/ci-image.yml b/.github/workflows/ci-image.yml index db98022d5..327ce0733 100644 --- a/.github/workflows/ci-image.yml +++ b/.github/workflows/ci-image.yml @@ -56,7 +56,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx with: - driver: local buildkitd-config: ${{ steps.buildkit.outputs.config }} - name: Build and push CI image diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 42d991b60..7447b1e42 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -204,7 +204,6 @@ jobs: - name: Set up buildx (local driver) uses: ./.github/actions/setup-buildx with: - driver: local buildkitd-config: /etc/buildkit/buildkitd.toml - name: Download Rust binary artifact diff --git a/.github/workflows/driver-vm-macos.yml b/.github/workflows/driver-vm-macos.yml index 5b2bac927..ed875e4ba 100644 --- a/.github/workflows/driver-vm-macos.yml +++ b/.github/workflows/driver-vm-macos.yml @@ -151,8 +151,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Install zstd run: apt-get update && apt-get install -y --no-install-recommends zstd && rm -rf /var/lib/apt/lists/* diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 7b9bb2f92..520a51c65 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -179,8 +179,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Mark workspace safe for git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" @@ -349,8 +347,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Build macOS binary via Docker run: | @@ -498,8 +494,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Build macOS binary via Docker run: | diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 60966b3b6..19d9df47f 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -210,8 +210,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Mark workspace safe for git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" @@ -382,8 +380,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Build macOS binary via Docker run: | @@ -617,8 +613,6 @@ jobs: - name: Set up Docker Buildx uses: ./.github/actions/setup-buildx - with: - driver: local - name: Build macOS binary via Docker run: |