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:51:20 +01:00
commit 1962115ab3
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/docker/type_switcher/swap_docker_type.sh
View File

@ -70,7 +70,7 @@ dockerSwitcherSwap()
installDocker;
fi
dockerServiceStart rooted;
dockerSwitcherUpdateContainersToDockerType;
dockerSwitcherUpdateContainersToDockerType "$docker_type";
reconcileDockerOwnership "$CFG_DOCKER_INSTALL_TYPE";
dockerStartAllApps;
databaseOptionInsert "docker_type" $CFG_DOCKER_INSTALL_TYPE;
@ -109,7 +109,7 @@ dockerSwitcherSwap()
dockerServiceStop rooted;
fi
dockerServiceStart rootless;
dockerSwitcherUpdateContainersToDockerType;
dockerSwitcherUpdateContainersToDockerType "$docker_type";
reconcileDockerOwnership "$CFG_DOCKER_INSTALL_TYPE";
dockerStartAllApps;
databaseOptionInsert "docker_type" $CFG_DOCKER_INSTALL_TYPE;
@ -145,12 +145,15 @@ switchMigrateBackupApps()
return 0
fi
local subdirectories=($(find "$containers_dir" -mindepth 1 -maxdepth 1 -type d))
local saved_type="$CFG_DOCKER_INSTALL_TYPE"
CFG_DOCKER_INSTALL_TYPE="$old_mode"
resolveDockerInstallUser
# Enumerate under the OLD mode — containers/ is still owned by its container
# user here, so runFileOp (now resolved to that user) can list it (the
# manager can't list the 751 dockerinstall-owned dir under rootless).
local subdirectories=($(runFileOp find "$containers_dir" -mindepth 1 -maxdepth 1 -type d))
local failed=()
local dir app_name
for dir in "${subdirectories[@]}"; do

43
scripts/docker/type_switcher/switch_containers_type.sh
View File

@ -2,27 +2,28 @@
dockerSwitcherUpdateContainersToDockerType()
{
if [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
# Scannning the containers folder
local subdirectories=($(find "$containers_dir" -maxdepth 1 -type d))
for dir in "${subdirectories[@]}"; do
dockerSwitcherScanContainersForSocket "$dir"
if [[ $docker_socket_file_updated == "true" ]]; then
dockerRestartAppViaInstall $(basename $dir);
fi
docker_socket_file_updated="false"
done
fi
# Called mid-switch (new daemon up, BEFORE reconcileDockerOwnership), so
# containers/ is still owned by the OLD mode's container user. Enumerate as
# that user — containers/ isn't list-readable by the manager under rootless,
# and CFG is already the TARGET mode — by flipping CFG to old_mode just for
# the find, then restoring it so the per-app socket scan + restart below talk
# to the NEW daemon. (The two former rooted/rootless branches were identical.)
local old_mode="$1"
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
# Scannning the containers folder
local subdirectories=($(find "$containers_dir" -maxdepth 1 -type d))
for dir in "${subdirectories[@]}"; do
dockerSwitcherScanContainersForSocket "$dir"
if [[ $docker_socket_file_updated == "true" ]]; then
dockerRestartAppViaInstall $(basename $dir);
fi
docker_socket_file_updated="false"
done
local saved_type="$CFG_DOCKER_INSTALL_TYPE"
if [[ -n "$old_mode" ]]; then
CFG_DOCKER_INSTALL_TYPE="$old_mode"
resolveDockerInstallUser
fi
local subdirectories=($(runFileOp find "$containers_dir" -maxdepth 1 -type d))
CFG_DOCKER_INSTALL_TYPE="$saved_type"
resolveDockerInstallUser
for dir in "${subdirectories[@]}"; do
dockerSwitcherScanContainersForSocket "$dir"
if [[ $docker_socket_file_updated == "true" ]]; then
dockerRestartAppViaInstall $(basename $dir);
fi
docker_socket_file_updated="false"
done
}