mptyl/ThothII
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(deploy): isolate compose smoke resources

Browse Source
This commit is contained in:
marcopan
2026-07-11 22:16:51 +02:00
parent 767df63a33
commit 0ca6346f75
3 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/docker-smoke.sh
+32 -11
View File
@@ -3,23 +3,44 @@ set -eu
cd "$(dirname "$0")/.."
compose="docker compose --profile external"
marker="smoke-$(date +%s)-$$"
headers=""
smoke_project=${SMOKE_PROJECT:-"thothii-smoke-$(date +%s)-$$"}
keep_resources=${KEEP_SMOKE_RESOURCES:-0}
case "$smoke_project" in
thothii)
echo "SMOKE_PROJECT=thothii is reserved for the operator stack" >&2
exit 2
;;
""|*[!a-z0-9_-]*|[!a-z0-9]*)
echo "invalid SMOKE_PROJECT: use lowercase letters, digits, hyphens, or underscores" >&2
exit 2
;;
esac
compose() {
docker compose --project-name "$smoke_project" --profile external "$@"
}
# Avoid colliding with a developer's existing service. Production/developer Compose still
# defaults to 8080; a published port of 0 asks Docker for a free ephemeral smoke port.
export THOTH_HTTP_PORT=${THOTH_HTTP_PORT:-0}
cleanup() {
if [ -n "$headers" ]; then rm -f "$headers"; fi
# Deliberately omit --volumes: an ordinary smoke run must preserve user data.
$compose down --remove-orphans >/dev/null 2>&1 || true
if [ "$keep_resources" = "1" ]; then
echo "Keeping smoke resources for project $smoke_project (KEEP_SMOKE_RESOURCES=1)." >&2
else
# The unique project namespace makes this safe: remove the smoke volume while leaving
# the fixed `thothii` operator project and every operator-owned volume untouched.
compose down --volumes >/dev/null 2>&1 || true
fi
}
trap cleanup EXIT HUP INT TERM
$compose config --quiet
$compose up --build --wait core frontend
published=$($compose port frontend 8080)
compose config --quiet
compose up --build --wait core frontend
published=$(compose port frontend 8080)
http_port=${published##*:}
curl --fail --silent --show-error "http://127.0.0.1:$http_port/health" >/dev/null
@@ -40,12 +61,12 @@ rm -f "$headers"
headers=""
# Write through the named volume, restart the application, and prove persistence.
$compose exec -T core sh -c 'printf "%s\n" "$1" > /data/.compose-smoke-marker' sh "$marker"
$compose restart core
$compose up --wait core frontend
persisted=$($compose exec -T core sh -c 'cat /data/.compose-smoke-marker')
compose exec -T core sh -c 'printf "%s\n" "$1" > /data/.compose-smoke-marker' sh "$marker"
compose restart core
compose up --wait core frontend
persisted=$(compose exec -T core sh -c 'cat /data/.compose-smoke-marker')
[ "$persisted" = "$marker" ]
$compose exec -T core rm -f /data/.compose-smoke-marker
compose exec -T core rm -f /data/.compose-smoke-marker
curl --fail --silent --show-error "http://127.0.0.1:$http_port/health" >/dev/null
echo "Compose health, SSE proxy, and restart persistence checks passed."