Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 3 additions & 29 deletions .github/actions/setup-buildx/action.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/driver-vm-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
Loading