Compare commits

..

No commits in common. "f8824971d6fb03d0cbc5c36cffd76022a838e480" and "dcbb3c1759c364c61c8e6ea598eb3a0748820fa2" have entirely different histories.

3 changed files with 4 additions and 4 deletions

View File

@ -114,6 +114,6 @@ _appReqServiceInstalled()
status=$(dockerCheckAppInstalled "$svc" "docker" 2>/dev/null) status=$(dockerCheckAppInstalled "$svc" "docker" 2>/dev/null)
[[ "$status" == "installed" ]] && return 0 || return 1 [[ "$status" == "installed" ]] && return 0 || return 1
fi fi
# Fallback: ask docker directly (mode-aware: rootless hits the rootless socket). # Fallback: ask docker directly.
runFileOp docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^${svc}-service$" sudo docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^${svc}-service$"
} }

View File

@ -3,7 +3,7 @@
checkLibrePortalWebUIImageRequirement() checkLibrePortalWebUIImageRequirement()
{ {
if [[ $CFG_REQUIREMENT_WEBUI == "true" ]]; then if [[ $CFG_REQUIREMENT_WEBUI == "true" ]]; then
if runFileOp docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "libreportal-service:latest"; then if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "libreportal-service:latest"; then
isSuccessful "LibrePortal WebUI Docker Image appears to be setup." isSuccessful "LibrePortal WebUI Docker Image appears to be setup."
else else
isNotice "LibrePortal WebUI Docker Image has not been setup." isNotice "LibrePortal WebUI Docker Image has not been setup."

View File

@ -17,7 +17,7 @@ webuiSystemDisk() {
local docker_percent="0" local docker_percent="0"
if command -v docker &> /dev/null; then if command -v docker &> /dev/null; then
docker_usage=$(runFileOp docker system df --format "{{.Size}}" 2>/dev/null | head -1 || echo "N/A") docker_usage=$(docker system df --format "{{.Size}}" | head -1 2>/dev/null || echo "N/A")
if [[ "$docker_usage" != "N/A" ]]; then if [[ "$docker_usage" != "N/A" ]]; then
# Convert Docker usage to GB for calculation # Convert Docker usage to GB for calculation
docker_used=$(echo "$docker_usage" | sed 's/GB//g' | sed 's/MB//g' | awk '{print $1*1}' 2>/dev/null || echo "0") docker_used=$(echo "$docker_usage" | sed 's/GB//g' | sed 's/MB//g' | awk '{print $1*1}' 2>/dev/null || echo "0")