From 7279fe26d4a9bb75c5e67441a7a6467cdc5bf229 Mon Sep 17 00:00:00 2001 From: ailg666 Date: Thu, 19 Dec 2024 09:21:15 +0000 Subject: [PATCH] Sync from GitHub --- xy_install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xy_install.sh b/xy_install.sh index b97fa9c..8306005 100644 --- a/xy_install.sh +++ b/xy_install.sh @@ -2017,6 +2017,9 @@ fix_docker() { if [ -f /etc/synoinfo.conf ]; then DOCKER_ROOT_DIR=$(docker info 2>/dev/null | grep 'Docker Root Dir' | awk -F': ' '{print $2}') DOCKER_CONFIG_FILE="${DOCKER_ROOT_DIR%/@docker}/@appconf/ContainerManager/dockerd.json" + elif grep -q 'NAME="iStoreOS"' /etc/os-release; then + DOCKER_CONFIG_FILE=$(ps w | grep dockerd | awk '{for(i=1;i<=NF;i++) if ($i ~ /^--config-file(=|$)/) {if ($i ~ /^--config-file=/) print substr($i, index($i, "=") + 1); else print $(i+1)}}') + DOCKER_CONFIG_FILE=${DOCKER_CONFIG_FILE:-/etc/docker/daemon.json} else DOCKER_CONFIG_FILE='/etc/docker/daemon.json' fi @@ -2047,7 +2050,6 @@ fix_docker() { exit 0 fi - docker_pid docker rmi hello-world:latest >/dev/null 2>&1