Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[25.0 backport] update RootlessKit to 2.0.2 #47508

Merged
merged 2 commits into from Mar 6, 2024
Merged

[25.0 backport] update RootlessKit to 2.0.2 #47508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77de535
Dockerfile: update RootlessKit to v2.0.2
AkihiroSuda Mar 5, 2024
d27fe25
dockerd-rootless-setuptool.sh: check RootlessKit functionality
AkihiroSuda Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Expand Up @@ -352,7 +352,7 @@ FROM base AS rootlesskit-src
WORKDIR /usr/src/rootlesskit
RUN git init . && git remote add origin "https://github.com/rootless-containers/rootlesskit.git"
# When updating, also update vendor.mod and hack/dockerfile/install/rootlesskit.installer accordingly.
ARG ROOTLESSKIT_VERSION=v2.0.1
ARG ROOTLESSKIT_VERSION=v2.0.2
RUN git fetch -q --depth 1 origin "${ROOTLESSKIT_VERSION}" +refs/tags/*:refs/tags/* && git checkout -q FETCH_HEAD

FROM base AS rootlesskit-build
Expand Down
7 changes: 7 additions & 0 deletions contrib/dockerd-rootless-setuptool.sh
View file
Open in desktop
Expand Up @@ -269,6 +269,13 @@ init() {
# - sysctl: "net.ipv4.ip_unprivileged_port_start"
# - external binary: slirp4netns
# - external binary: fuse-overlayfs

# check RootlessKit functionality. RootlessKit will print hints if something is still unsatisfied.
# (e.g., `kernel.apparmor_restrict_unprivileged_userns` constraint)
if ! rootlesskit true; then
ERROR "RootlessKit failed, see the error messages and https://rootlesscontaine.rs/getting-started/common/ ."
exit 1
fi
}

# CLI subcommand: "check"
Expand Down
2 changes: 1 addition & 1 deletion hack/dockerfile/install/rootlesskit.installer
View file
Open in desktop
@@ -1,7 +1,7 @@
#!/bin/sh

# When updating, also update vendor.mod and Dockerfile accordingly.
: "${ROOTLESSKIT_VERSION:=v2.0.1}"
: "${ROOTLESSKIT_VERSION:=v2.0.2}"

install_rootlesskit() {
case "$1" in
Expand Down