Skip to content

dockerfile: run buildkitd within a cgroup namespace for cgroup v2 #6368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −2
Open

dockerfile: run buildkitd within a cgroup namespace for cgroup v2 #6368

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ FROM scratch AS release
COPY --link --from=releaser /out/ /

FROM alpine:${ALPINE_VERSION} AS buildkit-export-alpine
RUN apk add --no-cache fuse3 git openssh openssl pigz xz iptables ip6tables \
RUN apk add --no-cache fuse3 git openssh openssl pigz xz iptables ip6tables util-linux-misc \
&& ln -s fusermount3 /usr/bin/fusermount
COPY --link examples/buildctl-daemonless/buildctl-daemonless.sh /usr/bin/
VOLUME /var/lib/buildkit
Expand Down Expand Up @@ -380,8 +380,37 @@ EOT

FROM buildkit-export AS buildkit-linux
COPY --link --from=binaries / /usr/bin/
COPY --link --chmod=755 <<EOF /usr/bin/buildkitd-entrypoint
#!/bin/sh
#
# For cgroup v2, ensure buildkitd has a namespaced view of /sys/fs/cgroup by
# running in a new cgroup and mount namespace and remounting /sys/fs/cgroup.
# Assume we are already in our own cgroup ns if the current cgroup path is
# "/".

set -e

if [ -e /sys/fs/cgroup/cgroup.controllers ]; then
if [ "\$(cut -d: -f3 /proc/self/cgroup)" != "/" ]; then
echo creating cgroup namespace
exec /usr/bin/unshare --cgroup --mount /usr/bin/with-cgroupfs-remount buildkitd "\$@"
fi
fi

exec /usr/bin/buildkitd "\$@"
EOF
COPY --link --chmod=755 <<EOF /usr/bin/with-cgroupfs-remount
#!/bin/sh
set -e

options="\$(awk '\$2 == "/sys/fs/cgroup" { print \$4 }' /proc/self/mounts)"
umount /sys/fs/cgroup
mount -t cgroup2 -o "\$options" cgroup2 /sys/fs/cgroup

exec "\$@"
EOF
ENV BUILDKIT_SETUP_CGROUPV2_ROOT=1
ENTRYPOINT ["buildkitd"]
ENTRYPOINT ["/usr/bin/buildkitd-entrypoint"]

FROM buildkit-linux AS buildkit-linux-debug
COPY --link --from=dlv /out/dlv /usr/bin/dlv
Expand Down
Loading