Spaces:
Paused
Paused
stderr echo + stdbuf for log visibility; trace x11vnc/noVNC
Browse files- Dockerfile +2 -1
- ubuntu-desktop/start-desktop.sh +3 -3
Dockerfile
CHANGED
|
@@ -40,7 +40,8 @@ COPY ubuntu-desktop/start-desktop.sh /opt/start-desktop.sh
|
|
| 40 |
RUN chmod +x /scripts/entrypoint.sh /opt/start-desktop.sh
|
| 41 |
|
| 42 |
ENV PERSIST_PATH=/data
|
| 43 |
-
|
|
|
|
| 44 |
ENV DESKTOP_HOME=/data/desktop-home
|
| 45 |
ENV DISPLAY=:99
|
| 46 |
ENV VNC_PORT=5901
|
|
|
|
| 40 |
RUN chmod +x /scripts/entrypoint.sh /opt/start-desktop.sh
|
| 41 |
|
| 42 |
ENV PERSIST_PATH=/data
|
| 43 |
+
# stdbuf so echo/flush shows in HF run log without delay
|
| 44 |
+
ENV RUN_CMD="stdbuf -oL -eL /opt/start-desktop.sh"
|
| 45 |
ENV DESKTOP_HOME=/data/desktop-home
|
| 46 |
ENV DISPLAY=:99
|
| 47 |
ENV VNC_PORT=5901
|
ubuntu-desktop/start-desktop.sh
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
#!/bin/bash
|
| 2 |
# Start Ubuntu desktop: Xvfb + XFCE + x11vnc + noVNC on 7860
|
| 3 |
# HOME is set to persistent dir by caller (sync/entrypoint). Here we ensure and use it.
|
| 4 |
-
echo "[start-desktop] Starting ..."
|
| 5 |
set -e
|
| 6 |
|
| 7 |
export PERSIST_PATH="${PERSIST_PATH:-/data}"
|
|
@@ -28,7 +28,7 @@ dbus-daemon --session 2>/dev/null || true
|
|
| 28 |
startxfce4 &
|
| 29 |
DESKTOP_PID=$!
|
| 30 |
sleep 3
|
| 31 |
-
echo "[start-desktop] XFCE started, starting x11vnc ..."
|
| 32 |
|
| 33 |
# x11vnc: share display :99 on port 5901 (do not exit on failure so noVNC can still start)
|
| 34 |
x11vnc -display "$DISPLAY" -rfbport "$VNC_PORT" -forever -shared -noxdamage -bg || true
|
|
@@ -51,6 +51,6 @@ fi
|
|
| 51 |
set -e
|
| 52 |
|
| 53 |
# noVNC: must run in foreground; listen on 0.0.0.0 so HF proxy can reach it
|
| 54 |
-
echo "[start-desktop] Starting noVNC on 0.0.0.0:$NOVNC_PORT ..."
|
| 55 |
# Use bash -c so novnc_proxy runs as main process; if it exits, keep container alive with sleep
|
| 56 |
exec /bin/bash -c "cd /opt/noVNC && ./utils/novnc_proxy --listen 0.0.0.0:$NOVNC_PORT --vnc localhost:$VNC_PORT --web /opt/noVNC" || exec sleep infinity
|
|
|
|
| 1 |
#!/bin/bash
|
| 2 |
# Start Ubuntu desktop: Xvfb + XFCE + x11vnc + noVNC on 7860
|
| 3 |
# HOME is set to persistent dir by caller (sync/entrypoint). Here we ensure and use it.
|
| 4 |
+
echo "[start-desktop] Starting ..." >&2
|
| 5 |
set -e
|
| 6 |
|
| 7 |
export PERSIST_PATH="${PERSIST_PATH:-/data}"
|
|
|
|
| 28 |
startxfce4 &
|
| 29 |
DESKTOP_PID=$!
|
| 30 |
sleep 3
|
| 31 |
+
echo "[start-desktop] XFCE started, starting x11vnc ..." >&2
|
| 32 |
|
| 33 |
# x11vnc: share display :99 on port 5901 (do not exit on failure so noVNC can still start)
|
| 34 |
x11vnc -display "$DISPLAY" -rfbport "$VNC_PORT" -forever -shared -noxdamage -bg || true
|
|
|
|
| 51 |
set -e
|
| 52 |
|
| 53 |
# noVNC: must run in foreground; listen on 0.0.0.0 so HF proxy can reach it
|
| 54 |
+
echo "[start-desktop] Starting noVNC on 0.0.0.0:$NOVNC_PORT ..." >&2
|
| 55 |
# Use bash -c so novnc_proxy runs as main process; if it exits, keep container alive with sleep
|
| 56 |
exec /bin/bash -c "cd /opt/noVNC && ./utils/novnc_proxy --listen 0.0.0.0:$NOVNC_PORT --vnc localhost:$VNC_PORT --web /opt/noVNC" || exec sleep infinity
|