Paul Nothaft
efa6b4a205
@Rekoo-PS confirmed the prior #521 fix landed on beta but reported the preview still shows the default "PicPeak" title — their brand is "arkan-studio". Root cause: that fix used Vite's build-time %VITE_DEFAULT_TITLE% substitution. Self-hosters running the pre-built ghcr.io/the-luap/picpeak/frontend image can't override at build time without rebuilding, so they were stuck with whatever the upstream build baked in. Pivot to runtime substitution: the frontend container now reads BRAND_TITLE / BRAND_DESCRIPTION env vars on startup and envsubsts them into index.html. Change the values in .env, restart the frontend service, done — no rebuild required. Mechanics: - frontend/index.html: tokens are now ${BRAND_TITLE} / ${BRAND_DESCRIPTION} (shell expansion syntax, passes through Vite unchanged into the built dist). - frontend/Dockerfile: install gettext (provides envsubst), snapshot /usr/share/nginx/html/index.html → index.html.tpl at build, install docker-entrypoint.sh, wire ENTRYPOINT to it. The .tpl is the immutable source — every container start re-renders index.html from .tpl, so restarts pick up new env values cleanly (no accidental "first-boot env stuck forever" trap). - frontend/docker-entrypoint.sh: applies defaults if env unset, runs envsubst (locked to BRAND_TITLE + BRAND_DESCRIPTION explicitly so /assets/*.js template literals aren't touched if anyone ever extends substitution to the bundle), execs nginx. - frontend/vite.config.ts: drop the htmlTitleDefaults plugin — no longer needed since substitution is fully runtime. - frontend/.env.example + .env.production.example: drop the VITE_DEFAULT_* docs (the vars no longer have effect). - docker-compose.yml + docker-compose.production.yml: pass BRAND_TITLE / BRAND_DESCRIPTION env into the frontend service with sensible defaults so unconfigured installs work unchanged. - .env.example: add BRAND_TITLE / BRAND_DESCRIPTION with comment pointing at the social-preview use case. Verified end-to-end against the built image: - BRAND_TITLE="Arkan Studio" BRAND_DESCRIPTION="Wedding photographs by Arkan Studio" → index.html serves <title>Arkan Studio</title> + og:title="Arkan Studio" + og:description correctly substituted. - .tpl preserves ${...} tokens so the next restart can re-substitute. - Bundle assets unaffected. - Defaults applied when env unset → <title>PicPeak</title>. Docs PR in picpeak-docs describes the two new env vars under "Social link preview fallback" in the environment-variables reference. Refs: #521
41 lines
1.6 KiB
Bash
Executable File
41 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Frontend container entrypoint (#521).
|
|
#
|
|
# Renders /usr/share/nginx/html/index.html from a build-time .tpl
|
|
# snapshot, substituting BRAND_TITLE / BRAND_DESCRIPTION env vars into
|
|
# the static HTML head. This is what self-hosters running the pre-built
|
|
# GHCR image use to brand their link-preview fallback — see the matching
|
|
# comment in frontend/index.html for the three-path architecture
|
|
# (per-event OG endpoint, crawler-detected SPA shell, and this static
|
|
# fallback that catches WhatsApp Business / Twilio / LinkPreview).
|
|
#
|
|
# Re-runs on every container start. The .tpl is the immutable source so
|
|
# changing BRAND_TITLE in compose env and `docker compose up -d frontend`
|
|
# is enough — no rebuild required.
|
|
#
|
|
# Locked to BRAND_TITLE + BRAND_DESCRIPTION explicitly (rather than
|
|
# letting envsubst expand every ${...} it finds) so the JS bundle's
|
|
# template literals in /assets/*.js stay untouched if anyone ever
|
|
# accidentally points the substitution at them.
|
|
set -eu
|
|
|
|
: "${BRAND_TITLE:=PicPeak}"
|
|
: "${BRAND_DESCRIPTION:=Photo gallery shared with PicPeak.}"
|
|
|
|
export BRAND_TITLE BRAND_DESCRIPTION
|
|
|
|
TEMPLATE=/usr/share/nginx/html/index.html.tpl
|
|
RENDERED=/usr/share/nginx/html/index.html
|
|
|
|
if [ -f "$TEMPLATE" ]; then
|
|
envsubst '${BRAND_TITLE} ${BRAND_DESCRIPTION}' < "$TEMPLATE" > "$RENDERED"
|
|
else
|
|
# Template missing — image build skipped the .tpl rename for some
|
|
# reason. Don't crash: nginx can still serve whatever is at
|
|
# $RENDERED (probably the unsubstituted output of `npm run build`).
|
|
# Log loudly so it's visible during boot.
|
|
echo "[frontend-entrypoint] WARN: $TEMPLATE missing; serving $RENDERED as-is." >&2
|
|
fi
|
|
|
|
exec "$@"
|