InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rootless: use getsubids tool for validation if possible

Browse Source 
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: YR Chen <stevapple@icloud.com>
This commit is contained in:
YR Chen
2024-12-05 15:37:36 +08:00
committed by Sebastiaan van Stijn
parent 02563f2805
commit 9509f27e28
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/dockerd-rootless-setuptool.sh
View File

@@ -228,8 +228,13 @@ init() {
fi
fi
# instructions: validate subuid/subgid files for current user
if ! grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subuid 2> /dev/null; then
# instructions: validate subuid for current user
if command -v "getsubids" > /dev/null 2>&1; then
getsubids "$USERNAME" > /dev/null 2>&1 || getsubids "$(id -u)" > /dev/null 2>&1
else
grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subuid 2> /dev/null
fi
if [ $? -ne 0 ]; then
instructions=$(
cat <<- EOI
${instructions}
@@ -238,7 +243,14 @@ init() {
EOI
)
fi
if ! grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subgid 2> /dev/null; then
# instructions: validate subgid for current user
if command -v "getsubids" > /dev/null 2>&1; then
getsubids -g "$USERNAME" > /dev/null 2>&1 || getsubids -g "$(id -u)" > /dev/null 2>&1
else
grep -q "^$USERNAME_ESCAPED:\|^$(id -u):" /etc/subgid 2> /dev/null
fi
if [ $? -ne 0 ]; then
instructions=$(
cat <<- EOI
${instructions}