Skip to content

Commit 51fbdf3

Browse files
authored
Merge pull request moby#5548 from crazy-max/containerd-lld
dockerfile: use lld linker for containerd build
2 parents 94d0f6e + 787d9d0 commit 51fbdf3

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

.github/workflows/test-os.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,3 +230,33 @@ jobs:
230230
if: always()
231231
run: |
232232
vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
233+
234+
sandbox-build:
235+
runs-on: ubuntu-24.04
236+
strategy:
237+
fail-fast: false
238+
matrix:
239+
platform:
240+
- linux/amd64
241+
- linux/arm64
242+
steps:
243+
-
244+
name: Checkout
245+
uses: actions/checkout@v4
246+
-
247+
name: Set up QEMU
248+
uses: docker/setup-qemu-action@v3
249+
-
250+
name: Set up Docker Buildx
251+
uses: docker/setup-buildx-action@v3
252+
with:
253+
version: ${{ env.SETUP_BUILDX_VERSION }}
254+
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
255+
buildkitd-flags: --debug
256+
-
257+
name: Build
258+
uses: docker/bake-action@v5
259+
with:
260+
targets: integration-tests-base
261+
set: |
262+
*.platform=${{ matrix.platform }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ VOLUME /var/lib/buildkit
203203
FROM gobuild-base AS containerd-build
204204
WORKDIR /go/src/github.com/containerd/containerd
205205
ARG TARGETPLATFORM
206-
ENV CGO_ENABLED=1 BUILDTAGS=no_btrfs GO111MODULE=off
206+
ENV CGO_ENABLED=1 CGO_LDFLAGS="-fuse-ld=lld" BUILDTAGS=no_btrfs GO111MODULE=off
207207
RUN xx-apk add musl-dev gcc && xx-go --wrap
208208
COPY --chmod=755 <<-EOT /build.sh
209209
#!/bin/sh

0 commit comments

Comments
 (0)