Update Dockerfile

Dockerfile

@@ -1,20 +1,14 @@
 # ============================================================
 # Hugging Face Space — Linux Desktop (XFCE) via noVNC
-# Base: Ubuntu 24.04 + XFCE4 + noVNC
+# Base: Ubuntu 24.04 + XFCE4 + Xvnc direct + noVNC
 # Access: http://your-space.hf.space (port 7860)
 # ============================================================
 
 FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV USER=user
 ENV HOME=/home/user
 ENV DISPLAY=:1
-ENV VNC_PORT=5901
-ENV NOVNC_PORT=7860
-ENV VNC_RESOLUTION=1280x800
-ENV VNC_COL_DEPTH=24
-ENV VNC_PW=hfdesktop
 
 # ── System dependencies ──────────────────────────────────────
 RUN apt-get update && apt-get install -y \
@@ -24,9 +18,10 @@ RUN apt-get update && apt-get install -y \
     xfce4-taskmanager \
     xfce4-screenshooter \
     thunar \
-    # VNC + noVNC
+    # VNC (Xvnc binary is in tigervnc-standalone-server)
     tigervnc-standalone-server \
     tigervnc-common \
+    # noVNC
     novnc \
     websockify \
     # Browser
@@ -36,7 +31,7 @@ RUN apt-get update && apt-get install -y \
     curl \
     git \
     unzip \
-    supervisor \
+    sudo \
     dbus-x11 \
     xfonts-base \
     xfonts-100dpi \
@@ -49,31 +44,23 @@ RUN apt-get update && apt-get install -y \
 # ── Create non-root user ──────────────────────────────────────
 RUN useradd -m -s /bin/bash user \
     && echo "user:user" | chpasswd \
-    && usermod -aG sudo user
+    && usermod -aG sudo user \
+    && echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
-# ── VNC password setup ────────────────────────────────────────
-RUN mkdir -p /home/user/.vnc \
-    && echo "${VNC_PW}" | vncpasswd -f > /home/user/.vnc/passwd \
-    && chmod 600 /home/user/.vnc/passwd \
+# ── VNC dirs & xstartup ───────────────────────────────────────
+RUN mkdir -p /home/user/.vnc
+COPY xstartup /home/user/.vnc/xstartup
+RUN chmod +x /home/user/.vnc/xstartup \
     && chown -R user:user /home/user/.vnc
 
-# ── XFCE startup script ───────────────────────────────────────
-RUN printf '#!/bin/bash\nexport DISPLAY=:1\neval $(dbus-launch --sh-syntax)\nstartxfce4 &\n' \
-    > /home/user/.vnc/xstartup \
-    && chmod +x /home/user/.vnc/xstartup \
-    && chown user:user /home/user/.vnc/xstartup
-
 # ── noVNC symlink ─────────────────────────────────────────────
-RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html 2>/dev/null || true
-
-# ── Supervisor config ─────────────────────────────────────────
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN ln -sf /usr/share/novnc/vnc.html /usr/share/novnc/index.html
 
-# ── Permissions ───────────────────────────────────────────────
-RUN chown -R user:user /home/user
+# ── Entrypoint ────────────────────────────────────────────────
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
 # ── Expose noVNC port (HF requires 7860) ──────────────────────
 EXPOSE 7860
 
-# ── Entrypoint ────────────────────────────────────────────────
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/entrypoint.sh"]