Skip to content

rootless: replace VPNKit with slirp4netns + support ARM #274

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

Closed
AkihiroSuda wants to merge 1 commit into from
Closed

rootless: replace VPNKit with slirp4netns + support ARM #274

Show file tree
Hide file tree
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
27 changes: 24 additions & 3 deletions 19.03-rc/dind-rootless/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 19.03-rc/dind/dockerd-entrypoint.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions 19.03/dind-rootless/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 19.03/dind/dockerd-entrypoint.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions 20.10-rc/dind-rootless/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 20.10-rc/dind/dockerd-entrypoint.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions 20.10/dind-rootless/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions 20.10/dind/dockerd-entrypoint.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions Dockerfile-dind-rootless.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,24 @@ RUN set -eux; \
--directory /usr/local/bin/ \
'docker-rootless-extras/rootlesskit' \
'docker-rootless-extras/rootlesskit-docker-proxy' \
'docker-rootless-extras/vpnkit' \
; \
rm rootless.tgz; \
\
rootlesskit --version; \
vpnkit --version
rootlesskit --version

# We do not use vpnkit binary included in x86_64 version of docker-rootless-extras,
# because it is not available for other architectures and yet slower than slirp4netns.

ENV SLIRP4NETNS_VERSION 1.1.8
ENV SLIRP4NETNS_SHA256SUMS_SHA256 366f40a49c0cf25b7e2ee22e9fae6df575127aef75f968454f5705a1ff0784ff
RUN set -eux; \
wget https://github.com/rootless-containers/slirp4netns/releases/download/v${SLIRP4NETNS_VERSION}/slirp4netns-$(uname -m); \
wget https://github.com/rootless-containers/slirp4netns/releases/download/v${SLIRP4NETNS_VERSION}/SHA256SUMS; \
echo "$SLIRP4NETNS_SHA256SUMS_SHA256 SHA256SUMS" | sha256sum -c -; \
grep "slirp4netns-$(uname -m)" SHA256SUMS | sha256sum -c -; \
mv slirp4netns-$(uname -m) /usr/local/bin/slirp4netns; \
rm -f SHA256SUMS; \
chmod +x /usr/local/bin/slirp4netns

# pre-create "/var/lib/docker" for our rootless user
RUN set -eux; \
Expand Down
8 changes: 5 additions & 3 deletions dockerd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,12 @@ if [ "$1" = 'dockerd' ]; then
fi
# TODO overlay support detection?
exec rootlesskit \
--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \
--mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \
--net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \
--mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-65520}" \
--slirp4netns-sandbox="${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SANDBOX:-auto}" \
--slirp4netns-seccomp="${DOCKERD_ROOTLESS_ROOTLESSKIT_SLIRP4NETNS_SECCOMP:-auto}" \
--disable-host-loopback \
--port-driver=builtin \
--port-driver="${DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER:-builtin}" \
--copy-up=/etc \
--copy-up=/run \
${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \
Expand Down
36 changes: 24 additions & 12 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.15.tgz"
},
"arm32v6": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.15.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.15.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/armel/docker-rootless-extras-19.03.15.tgz"
},
"arm32v7": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.15.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.15.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/armhf/docker-rootless-extras-19.03.15.tgz"
},
"arm64v8": {
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-19.03.15.tgz"
}
},
"dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377",
Expand All @@ -33,13 +36,16 @@
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-19.03.13-beta2.tgz"
},
"arm32v6": {
"dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/armel/docker-rootless-extras-19.03.13-beta2.tgz"
},
"arm32v7": {
"dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/armhf/docker-rootless-extras-19.03.13-beta2.tgz"
},
"arm64v8": {
"dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-19.03.13-beta2.tgz"
}
},
"dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377",
Expand All @@ -59,13 +65,16 @@
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.3.tgz"
},
"arm32v6": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/armel/docker-rootless-extras-20.10.3.tgz"
},
"arm32v7": {
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/armhf/docker-rootless-extras-20.10.3.tgz"
},
"arm64v8": {
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz"
"dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.3.tgz"
}
},
"dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377",
Expand All @@ -85,13 +94,16 @@
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz"
},
"arm32v6": {
"dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/armel/docker-rootless-extras-20.10.0-rc2.tgz"
},
"arm32v7": {
"dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/armhf/docker-rootless-extras-20.10.0-rc2.tgz"
},
"arm64v8": {
"dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz"
"dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz",
"rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.0-rc2.tgz"
}
},
"dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377",
Expand Down
3 changes: 1 addition & 2 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ for version in "${versions[@]}"; do

rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz"
# https://github.com/docker/docker-ce/blob/8fb3bb7b2210789a4471c017561c1b0de0b4f145/components/engine/hack/make/binary-daemon#L24
# "vpnkit is amd64-only" ... for now??
if [ "$bashbrewArch" = 'amd64' ] && wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then
if wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then
export rootlessExtrasUrl
doc="$(
jq <<<"$doc" -c \
Expand Down