Login: Zeilenumbruch vor "Einloggen"; dev-up.sh: Lock nicht an conmon vererben
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TiXsPUqw7oeomZ8wZrQW5q
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
4e0d27c4a6
commit
8e79e94bbb
@@ -24,7 +24,9 @@ IMAGE=localhost/kver:dev
|
|||||||
PORT="${KVER_DEV_PORT:-8081}"
|
PORT="${KVER_DEV_PORT:-8081}"
|
||||||
DATA="${KVER_DEV_DATA:-./prod_backup/2026-09-26}"
|
DATA="${KVER_DEV_DATA:-./prod_backup/2026-09-26}"
|
||||||
|
|
||||||
# Nur ein Lauf gleichzeitig (schnell aufeinanderfolgende Commits).
|
# Nur ein Lauf gleichzeitig (schnell aufeinanderfolgende Commits). podman
|
||||||
|
# bekommt fd 9 jeweils nicht mit (9>&-): conmon lebt so lange wie der
|
||||||
|
# Container und würde den Lock sonst für immer halten.
|
||||||
exec 9>.git/dev-up.lock
|
exec 9>.git/dev-up.lock
|
||||||
flock 9
|
flock 9
|
||||||
|
|
||||||
@@ -35,17 +37,17 @@ if [[ -z "$DSN" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "== $(date '+%F %T') Baue $IMAGE ($(git rev-parse --short HEAD))"
|
echo "== $(date '+%F %T') Baue $IMAGE ($(git rev-parse --short HEAD))"
|
||||||
podman build -q -t "$IMAGE" .
|
podman build -q -t "$IMAGE" . 9>&-
|
||||||
|
|
||||||
mounts=()
|
mounts=()
|
||||||
[[ -d "$DATA/data" ]] && mounts+=(-v "$DATA/data:/app/data:ro" -e KVER_GEOIP_ASN=/app/data/GeoLite2-ASN.mmdb)
|
[[ -d "$DATA/data" ]] && mounts+=(-v "$DATA/data:/app/data:ro" -e KVER_GEOIP_ASN=/app/data/GeoLite2-ASN.mmdb)
|
||||||
[[ -d "$DATA/media" ]] && mounts+=(-v "$DATA/media:/app/static/media:ro")
|
[[ -d "$DATA/media" ]] && mounts+=(-v "$DATA/media:/app/static/media:ro")
|
||||||
|
|
||||||
podman rm -f "$NAME" >/dev/null 2>&1 || true
|
podman rm -f "$NAME" >/dev/null 2>&1 9>&- || true
|
||||||
podman run -d --name "$NAME" -p "127.0.0.1:$PORT:8080" \
|
podman run -d --name "$NAME" -p "127.0.0.1:$PORT:8080" \
|
||||||
-e KVER_DSN="$DSN" \
|
-e KVER_DSN="$DSN" \
|
||||||
"${mounts[@]}" \
|
"${mounts[@]}" \
|
||||||
--security-opt label=disable "$IMAGE" >/dev/null
|
--security-opt label=disable "$IMAGE" >/dev/null 9>&-
|
||||||
|
|
||||||
# Warten, bis die API antwortet.
|
# Warten, bis die API antwortet.
|
||||||
for _ in $(seq 30); do
|
for _ in $(seq 30); do
|
||||||
|
|||||||
@@ -61,7 +61,8 @@ export function AuthBox() {
|
|||||||
<option value="604800">1 Woche</option>
|
<option value="604800">1 Woche</option>
|
||||||
<option value="31536000">1 Jahr</option>
|
<option value="31536000">1 Jahr</option>
|
||||||
</select>
|
</select>
|
||||||
</label>{" "}
|
</label>
|
||||||
|
<br />
|
||||||
<button type="submit" disabled={busy}>Einloggen</button>{" "}
|
<button type="submit" disabled={busy}>Einloggen</button>{" "}
|
||||||
<p className="muted">Noch kein Konto? <a href="#" onClick={show("register")}>Registrieren</a></p>
|
<p className="muted">Noch kein Konto? <a href="#" onClick={show("register")}>Registrieren</a></p>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Reference in New Issue
Block a user