Rename start.sh to entrypoint.sh

entrypoint.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "[entrypoint] starting up"
+
+mkdir -p /tmp/.X11-unix
+chmod 1777 /tmp/.X11-unix 2>/dev/null || true
+
+pkill -x Xvfb 2>/dev/null || true
+rm -f /tmp/.X11-unix/X99 2>/dev/null || true
+
+echo "[entrypoint] starting Xvfb on :99"
+Xvfb :99 -screen 0 1280x720x24 \
+    -ac \
+    +extension GLX \
+    +extension RANDR \
+    +render \
+    -noreset \
+    -nolisten tcp >/tmp/xvfb.log 2>&1 &
+
+XVFB_PID=$!
+
+cleanup() {
+    echo "[entrypoint] shutting down"
+    kill "$XVFB_PID" 2>/dev/null || true
+    wait "$XVFB_PID" 2>/dev/null || true
+}
+trap cleanup SIGTERM SIGINT EXIT
+
+for i in $(seq 1 40); do
+    if xdpyinfo -display :99 >/dev/null 2>&1; then
+        echo "[entrypoint] display :99 is ready"
+        break
+    fi
+    if ! kill -0 "$XVFB_PID" >/dev/null 2>&1; then
+        echo "[entrypoint] Xvfb died early"
+        cat /tmp/xvfb.log || true
+        exit 1
+    fi
+    sleep 0.5
+done
+
+export DISPLAY=:99
+echo "[entrypoint] DISPLAY=$DISPLAY"
+
+exec python -u server.py

start.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-# ╔══════════════════════════════════════════════════════════════╗
-# ║  entrypoint.sh                                               ║
-# ║  1. Create /tmp/.X11-unix if missing                         ║
-# ║  2. Start Xvfb on :99 manually (avoids pyvirtualdisplay      ║
-# ║     permission issues when running as non-root)              ║
-# ║  3. Export DISPLAY=:99                                       ║
-# ║  4. Hand off to Python server                                ║
-# ╚══════════════════════════════════════════════════════════════╝
-
-set -e
-
-echo "[entrypoint] ── Starting up ──────────────────────────────"
-
-# ── 1. X11 socket directory ──────────────────────────────────
-# Xvfb needs this; fails silently if it doesn't exist when
-# running as non-root.  Pre-create it so Xvfb can use it.
-mkdir -p /tmp/.X11-unix
-chmod 1777 /tmp/.X11-unix 2>/dev/null || true
-echo "[entrypoint] /tmp/.X11-unix ready"
-
-# ── 2. Kill any stale Xvfb ───────────────────────────────────
-pkill Xvfb 2>/dev/null || true
-rm -f /tmp/.X11-unix/X99 2>/dev/null || true
-
-# ── 3. Start Xvfb on :99 ────────────────────────────────────
-echo "[entrypoint] Starting Xvfb on :99 ..."
-Xvfb :99 -screen 0 1920x1080x24 \
-     -ac \
-     +extension GLX \
-     +extension RANDR \
-     +render \
-     -noreset \
-     -nolisten tcp &
-
-XVFB_PID=$!
-echo "[entrypoint] Xvfb PID=$XVFB_PID"
-
-# ── 4. Wait for display to be usable ─────────────────────────
-for i in $(seq 1 20); do
-    if xdpyinfo -display :99 >/dev/null 2>&1; then
-        echo "[entrypoint] ✓ Display :99 is ready  (attempt $i)"
-        break
-    fi
-    sleep 0.5
-done
-
-# ── 5. Export display for all child processes ─────────────────
-export DISPLAY=:99
-echo "[entrypoint] DISPLAY=$DISPLAY"
-
-# ── 6. Trap signals so Xvfb dies with the container ──────────
-trap "echo '[entrypoint] Shutting down...'; kill $XVFB_PID 2>/dev/null; exit 0" SIGTERM SIGINT
-
-# ── 7. Launch Python server ───────────────────────────────────
-echo "[entrypoint] ── Launching server ────────────────────────"
-exec python server.py