Merge claude/2
This commit is contained in:
commit
6c19fa006b
@ -160,6 +160,20 @@ installApp()
|
|||||||
dockerComposeUpdateAndStartApp "$app_name" install
|
dockerComposeUpdateAndStartApp "$app_name" install
|
||||||
_appCallHook "${app_slug}_install_post_start" "$app_name"
|
_appCallHook "${app_slug}_install_post_start" "$app_name"
|
||||||
|
|
||||||
|
# Reality gate: after `up`, the app MUST have at least one container
|
||||||
|
# (its compose project == the app dir name). An image-pull failure
|
||||||
|
# creates none, yet the deep compose call chain swallows that error —
|
||||||
|
# without this the app is recorded as installed+active with nothing
|
||||||
|
# running (the silent-fail seen when a low path-MTU black-holed pulls).
|
||||||
|
# ps -a (not just running) so a created-but-slow-to-start container
|
||||||
|
# still counts; only a total absence is treated as failure.
|
||||||
|
if declare -F dockerCommandRun >/dev/null 2>&1 \
|
||||||
|
&& ! dockerCommandRun "docker ps -a --filter label=com.docker.compose.project=$app_name --format '{{.Names}}' 2>/dev/null" 2>/dev/null | grep -q '[^[:space:]]'; then
|
||||||
|
isError "$app_name: no container started (image pull failed?) — not installed."
|
||||||
|
eval "$app_slug=n"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
((menu_number++))
|
((menu_number++))
|
||||||
echo ""
|
echo ""
|
||||||
echo "---- $menu_number. Running post-install integrations."
|
echo "---- $menu_number. Running post-install integrations."
|
||||||
|
|||||||
@ -122,12 +122,17 @@ dockerComposeUp()
|
|||||||
fi
|
fi
|
||||||
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
|
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
|
||||||
isNotice "Starting container for $app_name, this may take a while..."
|
isNotice "Starting container for $app_name, this may take a while..."
|
||||||
local result; result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && COMPOSE_PROGRESS=plain docker compose $setup_compose up $_compose_quiet $_compose_build_flag -d"); _rc=$?
|
local result; result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && COMPOSE_PROGRESS=plain docker compose $setup_compose up $_compose_quiet $_compose_build_flag -d")
|
||||||
checkSuccess "Started container for $app_name"
|
_rc=$?
|
||||||
|
# Restore $? to the compose exit code — a bare `checkSuccess`
|
||||||
|
# after `_rc=$?` would read the assignment's 0 and always print
|
||||||
|
# success, hiding a failed `up -d` (e.g. an image pull EOF).
|
||||||
|
( exit "$_rc" ); checkSuccess "Started container for $app_name"
|
||||||
elif [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
|
elif [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
|
||||||
isNotice "Starting container for $app_name, this may take a while..."
|
isNotice "Starting container for $app_name, this may take a while..."
|
||||||
local result; result=$(cd "$containers_dir$app_name" && COMPOSE_PROGRESS=plain docker compose $setup_compose up $_compose_quiet $_compose_build_flag -d); _rc=$?
|
local result; result=$(cd "$containers_dir$app_name" && COMPOSE_PROGRESS=plain docker compose $setup_compose up $_compose_quiet $_compose_build_flag -d)
|
||||||
checkSuccess "Started container for $app_name"
|
_rc=$?
|
||||||
|
( exit "$_rc" ); checkSuccess "Started container for $app_name"
|
||||||
fi
|
fi
|
||||||
# Used for the CLI dockertype switcher.
|
# Used for the CLI dockertype switcher.
|
||||||
else
|
else
|
||||||
|
|||||||
@ -148,7 +148,7 @@ EOF
|
|||||||
# This is the MTU the daemon PULLS over — a blind 1500 on a lower-path-MTU
|
# This is the MTU the daemon PULLS over — a blind 1500 on a lower-path-MTU
|
||||||
# link (Qubes/NAT/VPN) black-holes large image-layer downloads (EOF).
|
# link (Qubes/NAT/VPN) black-holes large image-layer downloads (EOF).
|
||||||
local resolved_mtu; resolved_mtu="$(networkRedetectMtu)"
|
local resolved_mtu; resolved_mtu="$(networkRedetectMtu)"
|
||||||
isNotice "Rootless uplink MTU: $resolved_mtu (CFG_NETWORK_MTU=${CFG_NETWORK_MTU:-auto})"
|
isNotice "Rootless uplink MTU: $resolved_mtu"
|
||||||
|
|
||||||
sudo bash -c "cat <<EOL > '$override_conf_file'
|
sudo bash -c "cat <<EOL > '$override_conf_file'
|
||||||
[Service]
|
[Service]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user