Container-plane docker now routes through the mode-aware helpers instead of sudo: simple calls (exec/ps/run/build/images/inspect/port/logs across ~15 app/check scripts) -> runFileOp docker (rootless socket as the install user; rooted via the docker group). The cd && docker compose paths drop the sudo on the rooted branch (the rootless branch already used dockerCommandRunInstallUser -- byte-identical now, manager-ready later); gluetun, which had no rootless branch, now uses dockerCommandRun so force-recreate works in both modes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
30 lines
1.3 KiB
Bash
Executable File
30 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
dockerComposeDownRemove()
|
|
{
|
|
local app_name="$1"
|
|
|
|
if [[ "$app_name" == "" ]]; then
|
|
isError "No app_name provided, unable to continue..."
|
|
else
|
|
if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
|
|
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
|
|
if [[ -d "$containers_dir$app_name" ]]; then
|
|
local result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose down -v --remove-orphans")
|
|
isNotice "Shutting down & Removing all $app_name container data"
|
|
dockerRemoveApp $app_name;
|
|
else
|
|
isNotice "App directory '$app_name' not found. Skipping container shutdown."
|
|
fi
|
|
elif [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
|
|
if [[ -d "$containers_dir$app_name" ]]; then
|
|
local result=$(cd $containers_dir$app_name && docker compose down -v --remove-orphans)
|
|
isNotice "Shutting down & Removing all $app_name container data"
|
|
dockerRemoveApp $app_name;
|
|
else
|
|
isNotice "App directory '$app_name' not found. Skipping container shutdown."
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
} |