mirror of
https://github.com/vndangkhoa/purestream.git
synced 2026-04-05 01:17:58 +07:00
Rollback to noVNC with Openbox and 1080p for mobile
This commit is contained in:
Khoa.vo
parent
17fdcf7d53
commit
672e467d40
3 changed files with 33 additions and 44 deletions
49
Dockerfile
49
Dockerfile
|
|
@ -10,13 +10,15 @@ RUN npm run build
|
|||
FROM python:3.11-slim
|
||||
|
||||
# Install system dependencies
|
||||
# Combined list for Playwright, KasmVNC, and general utilities
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
wget \
|
||||
curl \
|
||||
gnupg \
|
||||
ca-certificates \
|
||||
ffmpeg \
|
||||
# VNC & Display dependencies
|
||||
xvfb \
|
||||
x11vnc \
|
||||
openbox \
|
||||
# Playwright dependencies
|
||||
libnss3 \
|
||||
|
|
@ -37,44 +39,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
libatspi2.0-0 \
|
||||
libgtk-3-0 \
|
||||
fonts-liberation \
|
||||
# KasmVNC dependencies
|
||||
libjpeg62-turbo \
|
||||
libpng16-16 \
|
||||
libx11-6 \
|
||||
libxcursor1 \
|
||||
libxext6 \
|
||||
libxi6 \
|
||||
libxinerama1 \
|
||||
libxrender1 \
|
||||
libxtst6 \
|
||||
zlib1g \
|
||||
libssl3 \
|
||||
adduser \
|
||||
libfontconfig1 \
|
||||
libgl1 \
|
||||
libpixman-1-0 \
|
||||
libxfont2 \
|
||||
libxkbfile1 \
|
||||
libdatetime-perl \
|
||||
libwww-perl \
|
||||
xfonts-base \
|
||||
xfonts-75dpi \
|
||||
xfonts-100dpi \
|
||||
python3-yaml \
|
||||
supervisor \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install KasmVNC (Debian Bookworm)
|
||||
RUN wget -q https://github.com/kasmtech/KasmVNC/releases/download/v1.3.1/kasmvncserver_bookworm_1.3.1_amd64.deb -O /tmp/kasmvnc.deb \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends /tmp/kasmvnc.deb \
|
||||
&& rm /tmp/kasmvnc.deb \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Setup KasmVNC user
|
||||
# KasmVNC requires a non-root user for security best practices, but we run as root in this simple container.
|
||||
# We will run vncserver as root (not recommended but easiest for migration) or create a user.
|
||||
# Let's try running as root first with specific flags.
|
||||
# Install noVNC
|
||||
RUN mkdir -p /opt/novnc \
|
||||
&& wget -qO- https://github.com/novnc/noVNC/archive/v1.4.0.tar.gz | tar xz -C /opt/novnc --strip-components=1 \
|
||||
&& mkdir -p /opt/novnc/utils/websockify \
|
||||
&& wget -qO- https://github.com/novnc/websockify/archive/v0.11.0.tar.gz | tar xz -C /opt/novnc/utils/websockify --strip-components=1 \
|
||||
&& ln -s /opt/novnc/vnc.html /opt/novnc/index.html
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
|
|
@ -104,13 +77,11 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
|||
ENV PYTHONUNBUFFERED=1
|
||||
ENV CACHE_DIR=/app/cache
|
||||
ENV DISPLAY=:99
|
||||
# KasmVNC envs
|
||||
ENV KASM_VNC_ARGS="-httpport 6080 -FrameRate 60 -sslOnly 0"
|
||||
|
||||
# Set working directory to backend for correct imports
|
||||
WORKDIR /app/backend
|
||||
|
||||
# Expose ports (8002 = app, 6080 = KasmVNC)
|
||||
# Expose ports (8002 = app, 6080 = noVNC)
|
||||
EXPOSE 8002 6080
|
||||
|
||||
# Health check
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ export const Login: React.FC = () => {
|
|||
|
||||
const getVncUrl = () => {
|
||||
const host = window.location.hostname;
|
||||
// KasmVNC params: autoconnect=1, resize=scale (fit to screen), negotiate items
|
||||
return `http://${host}:6080/vnc.html?autoconnect=1&resize=scale&encrypt=0`;
|
||||
// autoconnect=true, resize=scale to fit, quality=9 for clear text
|
||||
return `http://${host}:6080/vnc.html?autoconnect=true&resize=scale&quality=9`;
|
||||
};
|
||||
|
||||
const handleVncLogin = async () => {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ logfile=/dev/stdout
|
|||
logfile_maxbytes=0
|
||||
loglevel=info
|
||||
|
||||
[program:kasmvnc]
|
||||
command=/usr/bin/vncserver -fg :99 -select-de -http-port 6080 -FrameRate 60 -SecurityTypes None -sslOnly 0 -geometry 1920x1080
|
||||
[program:xvfb]
|
||||
command=/usr/bin/Xvfb :99 -screen 0 1920x1080x24
|
||||
autorestart=true
|
||||
priority=100
|
||||
stdout_logfile=/dev/stdout
|
||||
|
|
@ -17,18 +17,36 @@ stderr_logfile_maxbytes=0
|
|||
command=openbox
|
||||
environment=DISPLAY=":99"
|
||||
autorestart=true
|
||||
priority=150
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:x11vnc]
|
||||
command=x11vnc -display :99 -forever -shared -nopw -listen 0.0.0.0 -xkb
|
||||
autorestart=true
|
||||
priority=200
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:novnc]
|
||||
command=/opt/novnc/utils/novnc_proxy --vnc localhost:5900 --listen 6080
|
||||
autorestart=true
|
||||
priority=300
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:app]
|
||||
command=python -m uvicorn main:app --host 0.0.0.0 --port 8002
|
||||
directory=/app/backend
|
||||
environment=DISPLAY=":99",PYTHONUNBUFFERED="1"
|
||||
autorestart=true
|
||||
priority=300
|
||||
priority=400
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
|
|
|
|||
Loading…
Reference in a new issue