7b7e6e06fb
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>
56 lines
2.1 KiB
Bash
Executable File
56 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
dockerComposeDown()
|
|
{
|
|
local app_name="$1"
|
|
local custom_compose="$2"
|
|
local type="$3"
|
|
|
|
if [[ "$app_name" == "" ]]; then
|
|
isError "Something went wrong...No app name provided..."
|
|
fi
|
|
|
|
isHeader "Docker Compose down $app_name"
|
|
|
|
# Make sure we are able to get the compose file
|
|
if [[ $compose_setup == "" ]]; then
|
|
setupBasicScanVariables "$app_name"
|
|
fi
|
|
|
|
# Compose file public variable for restarting etc
|
|
if [[ $compose_setup == "default" ]]; then
|
|
local setup_compose="-f docker-compose.yml"
|
|
local compose_file="docker-compose.yml"
|
|
elif [[ $compose_setup == "app" ]]; then
|
|
local setup_compose="-f docker-compose.yml -f docker-compose.$app_name.yml"
|
|
local compose_file="docker-compose.$app_name.yml"
|
|
fi
|
|
if [[ $custom_compose != "" ]]; then
|
|
local setup_compose="-f docker-compose.yml -f $custom_compose"
|
|
local compose_file="$custom_compose"
|
|
fi
|
|
|
|
if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
|
|
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
|
|
}
|