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

fix(compose): always emit a status line when downing an app

Browse Source 
dockerComposeDown printed the 'Docker Compose down <app>' header then could
fall through silently: when the effective install type (passed type arg or
CFG_DOCKER_INSTALL_TYPE) was empty/unrecognised no branch ran, and on a
non-Ubuntu/Debian OS the whole block was skipped. Collapse the duplicated
type=='' vs type!='' branches into one mode fallback and add notices for the
unknown-mode and unsupported-OS cases so the header always has a result line.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
This commit is contained in:
librelad 2026-05-24 13:09:21 +01:00
parent a7b30a4bf1
commit 7b7e6e06fb
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/docker/app/compose/down_app.sh
View File

@ -31,28 +31,25 @@ dockerComposeDown()
fi
if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
if [ -f "$containers_dir$app_name/$compose_file" ]; then
# Used for the standard LibrePortal app
if [[ "$type" == "" ]]; then
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
local result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose $setup_compose down" >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
elif [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
local result=$(cd "$containers_dir$app_name" && sudo docker compose $setup_compose down >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
fi
# Used for the CLI dockertype switcher.
else
if [[ $type == "rootless" ]]; then
local result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose $setup_compose down" >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
elif [[ $type == "rooted" ]]; then
local result=$(cd "$containers_dir$app_name" && sudo docker compose $setup_compose down >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
fi
fi
else
if [ ! -f "$containers_dir$app_name/$compose_file" ]; then
isNotice "Unable to find the compose file to docker compose down this application."
return 1
fi
# Explicit type arg (CLI dockertype switcher) wins, otherwise the
# configured install type. Every branch ends in a status line so the
# header is never left without output.
local mode="${type:-$CFG_DOCKER_INSTALL_TYPE}"
if [[ $mode == "rootless" ]]; then
local result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose $setup_compose down" >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
elif [[ $mode == "rooted" ]]; then
local result=$(cd "$containers_dir$app_name" && sudo docker compose $setup_compose down >/dev/null 2>&1)
checkSuccess "Shutting down container for $app_name"
else
isNotice "Unknown Docker install type '$mode' — cannot shut down $app_name."
fi
else
isNotice "Unsupported OS '$OS_TYPE' — cannot shut down $app_name."
fi
}