Skip to content

Commit

Permalink
Merge pull request #5548 from crazy-max/containerd-lld
Browse files Browse the repository at this point in the history
dockerfile: use lld linker for containerd build
  • Loading branch information
crazy-max authored Nov 25, 2024
2 parents 94d0f6e + 787d9d0 commit 51fbdf3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
30 changes: 30 additions & 0 deletions .github/workflows/test-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,33 @@ jobs:
if: always()
run: |
vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
sandbox-build:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm64
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: ${{ env.SETUP_BUILDX_VERSION }}
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
buildkitd-flags: --debug
-
name: Build
uses: docker/bake-action@v5
with:
targets: integration-tests-base
set: |
*.platform=${{ matrix.platform }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ VOLUME /var/lib/buildkit
FROM gobuild-base AS containerd-build
WORKDIR /go/src/github.com/containerd/containerd
ARG TARGETPLATFORM
ENV CGO_ENABLED=1 BUILDTAGS=no_btrfs GO111MODULE=off
ENV CGO_ENABLED=1 CGO_LDFLAGS="-fuse-ld=lld" BUILDTAGS=no_btrfs GO111MODULE=off
RUN xx-apk add musl-dev gcc && xx-go --wrap
COPY --chmod=755 <<-EOT /build.sh
#!/bin/sh
Expand Down

0 comments on commit 51fbdf3

Please sign in to comment.