Merge claude/1

This commit is contained in:
librelad 2026-05-24 18:58:48 +01:00
commit 048e967ec1

View File

@ -11,6 +11,21 @@ installLibrePortalImageWebUI()
reconcileWebuiDirOwnership
# copyFolder just restored the TEMPLATE docker-compose.yml, which carries raw
# #LIBREPORTAL|TAG|VALUE placeholders. On a fresh install the following
# dockerInstallApp (installLibrePortalAppWebUI) substitutes them; but on a
# REBUILD/update (libreportal already installed — this also runs via the WebUI
# deploy) nothing else does, leaving the at-rest compose unparseable by a plain
# `docker compose` (e.g. "invalid boolean: HEALTHCHECK_DATA"). Re-apply the tag
# processors here — the same self-heal up_app.sh uses — so the runtime compose
# is always fully substituted at rest, not just when started via the CLI.
if declare -F dockerConfigSetupFileWithData >/dev/null 2>&1 \
&& [[ "$(dockerCheckAppInstalled libreportal docker)" != "not_installed" ]]; then
initializeAppVariables libreportal >/dev/null 2>&1 || true
dockerConfigSetupFileWithData libreportal >/dev/null 2>&1 || true
checkSuccess "Re-applied LibrePortal WebUI compose tag substitutions"
fi
isNotice "Building libreportal-service image, this may take a while..."
local result=$(runFileOp docker build -t libreportal-service -f $containers_dir/libreportal/Dockerfile $containers_dir/libreportal >/dev/null 2>&1)
checkSuccess "Built LibrePortal WebUI Docker image"