Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/2

Browse Source
This commit is contained in:
librelad 2026-05-24 21:57:38 +01:00
commit a42f2c6618
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/checks/requirements/check_docker_rootless.sh
View File

@ -4,7 +4,7 @@ checkDockerRootlessRequirement()
{ {
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
### Docker Rootless ### Docker Rootless
if grep -q "ROOTLESS" $sysctl; then if grep -qs "ROOTLESS" $sysctl; then
isSuccessful "Docker Rootless appears to be installed." isSuccessful "Docker Rootless appears to be installed."
else else
isNotice "Docker Rootless does not appear to be installed." isNotice "Docker Rootless does not appear to be installed."

2
scripts/checks/requirements/check_install_type.sh
View File

@ -31,7 +31,7 @@ checkInstallTypeRequirement()
ISACT=$( (runSystem systemctl is-active docker ) 2>&1 ) ISACT=$( (runSystem systemctl is-active docker ) 2>&1 )
elif [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then elif [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
# Used for checking the rootless user # Used for checking the rootless user
local ISUSER=$( (id -u "$CFG_DOCKER_INSTALL_USER")) local ISUSER=$( (id -u "$CFG_DOCKER_INSTALL_USER") 2>&1 )
if [[ "$ISUSER" == *"no such user"* ]]; then if [[ "$ISUSER" == *"no such user"* ]]; then
ISACT=$(command -v docker &> /dev/null) ISACT=$(command -v docker &> /dev/null)
fi fi

4
scripts/docker/install/rootless/rootless_docker.sh
View File

@ -53,7 +53,7 @@ installDockerRootless()
echo "" echo ""
echo "---- $menu_number. Updating the sysctl file for Updating Debian 10." echo "---- $menu_number. Updating the sysctl file for Updating Debian 10."
echo "" echo ""
if sudo grep -q "kernel.unprivileged_userns_clone=1" $sysctl; then if sudo grep -qs "kernel.unprivileged_userns_clone=1" $sysctl; then
isNotice "kernel.unprivileged_userns_clone=1 already exists in $sysctl" isNotice "kernel.unprivileged_userns_clone=1 already exists in $sysctl"
else else
local result=$(echo "kernel.unprivileged_userns_clone=1" | sudo tee -a $sysctl > /dev/null) local result=$(echo "kernel.unprivileged_userns_clone=1" | sudo tee -a $sysctl > /dev/null)
@ -181,7 +181,7 @@ EOL"
echo "" echo ""
# Update sysctl file # Update sysctl file
if ! grep -qF "# DOCKER ROOTLESS SYSCTL START" "$sysctl"; then if ! grep -qsF "# DOCKER ROOTLESS SYSCTL START" "$sysctl"; then
local result=$(echo '# DOCKER ROOTLESS SYSCTL START' | sudo tee -a "$sysctl" > /dev/null) local result=$(echo '# DOCKER ROOTLESS SYSCTL START' | sudo tee -a "$sysctl" > /dev/null)
checkSuccess "Adding rootless header to sysctl" checkSuccess "Adding rootless header to sysctl"

2
scripts/docker/install/rootless/rootless_start_setup.sh
View File

@ -2,7 +2,7 @@
installDockerRootlessStartSetup() installDockerRootlessStartSetup()
{ {
if sudo grep -q "ROOTLESS" $sysctl; then if sudo grep -qs "ROOTLESS" $sysctl; then
isSuccessful "Docker Rootless appears to be installed." isSuccessful "Docker Rootless appears to be installed."
else else
installDockerRootless; installDockerRootless;