mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-10 04:36:40 +00:00
kevinveenbirkenbachandClaude Opus 4.7
f636cfe399
Per-app nginx gateways used proxy_pass with a literal docker container hostname. nginx OSS resolves that hostname once at startup; if the upstream container later restarts and gets a new IP (e.g. a partial compose-up after credential change), the gateway proxies onto a dead address until nginx itself reloads — the 502 we hit on taiga after a reuse-kept replaced the taiga-back container. Switch every per-app docker-hostname proxy_pass to a variable form so the embedded docker DNS re-resolves at request time: set $upstream_<rolename>_<purpose> http://<host>:<port>; proxy_pass $upstream_<rolename>_<purpose>; The full `resolver` directive (TTL + ipv6 toggle inherited from NETWORK_IPV6_ENABLED) lives in one SPOT — NETWORK_DOCKER_DNS_NGINX_DIRECTIVE in group_vars/all/08_networks.yml — so cache TTL and ipv6 stay consistent across the stack. In taiga the upstream `set` declarations hoist to server scope because taiga-back is reused across /api/, /oidc/ and /admin/; in nextcloud and kix each upstream is used exactly once so the declaration stays local. Locations whose original proxy_pass stripped the location prefix (`proxy_pass http://.../;` on /media/, /whiteboard/, /standalone-signaling/) keep that semantics via an explicit `rewrite ^<loc>(.*)$ /\$1 break;`, because variable-proxy_pass drops the implicit prefix-strip. kix's static files/kix-proxy.default.conf moves to templates/kix-proxy.default.conf.j2 so it can reference the new constant; the deploy task switches from copy to template accordingly. Drive-by: scripts/tests/e2e/rerun-spec.sh docstring refresh — the "only overwrites tests/playwright.spec.js" claim went stale when the rerunner started restaging every role-local playwright/*.js. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
104 lines
3.6 KiB
Bash
Executable File
104 lines
3.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Rerun a role-local Playwright spec against the live running stack.
|
|
#
|
|
# Preconditions:
|
|
# - The role has been deployed at least once, so the Playwright project is
|
|
# staged under $TEST_E2E_PLAYWRIGHT_STAGE_BASE_DIR/<role> with a rendered
|
|
# .env file.
|
|
# - The application under test is still running.
|
|
#
|
|
# This script intentionally does NOT re-render .env. It restages the
|
|
# role-local Playwright files (spec + companions) from the repo and reruns
|
|
# Playwright via the same container image the deploy-time runner uses.
|
|
#
|
|
# Usage:
|
|
# scripts/tests/e2e/rerun-spec.sh <role> [playwright args...] # nocheck: self-path-reference
|
|
# scripts/tests/e2e/rerun-spec.sh web-app-nextcloud --grep "talk admin" # nocheck: self-path-reference
|
|
set -euo pipefail
|
|
|
|
if [[ $# -lt 1 ]]; then
|
|
echo "usage: $0 <role> [playwright args...]" >&2
|
|
exit 2
|
|
fi
|
|
|
|
role="$1"
|
|
shift
|
|
|
|
repo_root="$(cd "$(dirname "$0")/../../.." && pwd)"
|
|
role_playwright_dir="$repo_root/roles/$role/files/playwright"
|
|
spec_src="$role_playwright_dir/playwright.spec.js"
|
|
services_yml="$repo_root/roles/test-e2e-playwright/meta/services.yml"
|
|
|
|
stage_base="${TEST_E2E_PLAYWRIGHT_STAGE_BASE_DIR:-/tmp/test-e2e-playwright}"
|
|
reports_base="${TEST_E2E_PLAYWRIGHT_REPORTS_BASE_DIR:-/var/lib/infinito/logs/test-e2e-playwright}"
|
|
|
|
stage_dir="$stage_base/$role"
|
|
reports_dir="$reports_base/$role"
|
|
env_file="$stage_dir/.env"
|
|
|
|
[[ -f "$spec_src" ]] || {
|
|
echo "missing spec: $spec_src" >&2
|
|
exit 1
|
|
}
|
|
[[ -d "$stage_dir" ]] || {
|
|
echo "missing staging dir (run deploy first): $stage_dir" >&2
|
|
exit 1
|
|
}
|
|
[[ -f "$env_file" ]] || {
|
|
echo "missing rendered env (run deploy first): $env_file" >&2
|
|
exit 1
|
|
}
|
|
|
|
image="${TEST_E2E_PLAYWRIGHT_IMAGE:-}"
|
|
if [[ -z "$image" ]]; then
|
|
base_image="$(awk '/^[[:space:]]*image:[[:space:]]/{print $2; exit}' "$services_yml")"
|
|
tag="$(awk -F'"' '/^[[:space:]]*version:[[:space:]]/{print $2; exit}' "$services_yml")"
|
|
image="${base_image}:${tag}"
|
|
fi
|
|
|
|
command -v docker >/dev/null || {
|
|
echo "docker not found in PATH" >&2
|
|
exit 1
|
|
}
|
|
|
|
mkdir -p "$stage_dir/tests" "$stage_dir/volume" "$reports_dir"
|
|
for role_js in "$role_playwright_dir"/*.js; do
|
|
[[ -f "$role_js" ]] || continue
|
|
cp "$role_js" "$stage_dir/tests/$(basename "$role_js")"
|
|
done
|
|
# Stage the shared service-gating helper so the spec can require("./service-gating").
|
|
helper_src="$repo_root/roles/test-e2e-playwright/files/service-gating.js"
|
|
if [[ -f "$helper_src" ]]; then
|
|
cp "$helper_src" "$stage_dir/tests/service-gating.js"
|
|
fi
|
|
# Stage the shared persona-flow helpers.
|
|
# personas/ holds the persona flow runners (biber.js, admin.js, guest.js,
|
|
# index.js) at the top and every helper module under personas/utils/. Copy
|
|
# both levels so a spec can `require("./personas")` (resolves to
|
|
# personas/index.js) or directly `require("./personas/<flow>")` /
|
|
# `require("./personas/utils/<helper>")` for a subset.
|
|
personas_dir="$repo_root/roles/test-e2e-playwright/files/personas"
|
|
if [[ -d "$personas_dir" ]]; then
|
|
mkdir -p "$stage_dir/tests/personas/utils"
|
|
for persona_file in "$personas_dir"/*.js; do
|
|
[[ -f "$persona_file" ]] || continue
|
|
cp "$persona_file" "$stage_dir/tests/personas/$(basename "$persona_file")"
|
|
done
|
|
for util_file in "$personas_dir"/utils/*.js; do
|
|
[[ -f "$util_file" ]] || continue
|
|
cp "$util_file" "$stage_dir/tests/personas/utils/$(basename "$util_file")"
|
|
done
|
|
fi
|
|
|
|
cmd="${TEST_E2E_PLAYWRIGHT_COMMAND:-npm install --no-fund --no-audit && npx playwright test${*:+ $*}}"
|
|
|
|
exec docker run --rm \
|
|
--ipc=host --shm-size=1g \
|
|
--env-file "$env_file" \
|
|
-v "$stage_dir:/e2e" \
|
|
-v "$stage_dir/volume:/volume" \
|
|
-v "$reports_dir:/reports" \
|
|
-w /e2e \
|
|
"$image" \
|
|
/bin/bash -lc "$cmd"
|