Skip to content

Commit

Permalink
Dockerfile: update runc to v1.1.1
Browse files Browse the repository at this point in the history
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
  • Loading branch information
crazy-max committed Apr 28, 2022
1 parent 8e37441 commit 61817bc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile-upstream:1.4

ARG RUNC_VERSION=v1.0.2
ARG RUNC_VERSION=v1.1.1
ARG CONTAINERD_VERSION=v1.6.3
# containerd v1.5 for integration tests
ARG CONTAINERD_ALT_VERSION_15=v1.5.11
Expand Down Expand Up @@ -45,7 +45,10 @@ ARG TARGETPLATFORM
# lld has issues building static binaries for ppc so prefer ld for it
RUN set -e; xx-apk add musl-dev gcc libseccomp-dev libseccomp-static; \
[ "$(xx-info arch)" != "ppc64le" ] || XX_CC_PREFER_LINKER=ld xx-clang --setup-target-triple
RUN --mount=from=runc-src,src=/usr/src/runc,target=. --mount=target=/root/.cache,type=cache \
RUN --mount=from=runc-src,src=/usr/src/runc,target=.,rw --mount=target=/root/.cache,type=cache \
# FIXME: temporarily patch runc to fix libseccomp issue https://github.com/seccomp/libseccomp-golang/pull/85
xx-go mod edit -replace github.com/seccomp/libseccomp-golang=github.com/tonistiigi/libseccomp-golang@v0.9.2-0.20220128225211-9a6b6bb05f8a && \
xx-go mod tidy && xx-go mod vendor && \
CGO_ENABLED=1 xx-go build -mod=vendor -ldflags '-extldflags -static' -tags 'apparmor seccomp netgo cgo static_build osusergo' -o /usr/bin/runc ./ && \
xx-verify --static /usr/bin/runc

Expand Down

0 comments on commit 61817bc

Please sign in to comment.