Update Dockerfile

Dockerfile

@@ -1,95 +1,104 @@
-# Use an Ubuntu base image
+# Use Ubuntu 22.04 as base
 FROM ubuntu:22.04
 
-# Set environment variables to non-interactive
+# Prevent interactive prompts
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install all dependencies
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
-    tigervnc-standalone-server \
+    # X11 and VNC essentials
+    xvfb \
+    x11vnc \
     fluxbox \
-    websockify \
+    x11-utils \
+    xdpyinfo \
+    # NoVNC for web access
     novnc \
-    python3 \
-    python3-pip \
-    psmisc \
+    websockify \
+    # Chromium/Electron dependencies
     libnss3 \
-    libglib2.0-0 \
+    libnspr4 \
     libatk1.0-0 \
     libatk-bridge2.0-0 \
     libcups2 \
     libdrm2 \
-    libgtk-3-0 \
-    libxss1 \
+    libdbus-1-3 \
+    libxkbcommon0 \
     libxcomposite1 \
-    libxrandr2 \
     libxdamage1 \
-    libxext6 \
     libxfixes3 \
-    libxi6 \
-    libxtst6 \
+    libxrandr2 \
+    libgbm1 \
+    libgtk-3-0 \
     libpango-1.0-0 \
     libcairo2 \
+    libasound2 \
+    libatspi2.0-0 \
+    libxshmfence1 \
+    # Additional libraries
+    libglib2.0-0 \
     libx11-6 \
-    libxkbcommon0 \
     libx11-xcb1 \
     libxcb1 \
-    libxcb-dri3-0 \
-    libxshmfence1 \
+    libxext6 \
+    libxi6 \
+    libxtst6 \
+    libxss1 \
     libgdk-pixbuf2.0-0 \
-    libfreetype6 \
-    libfontconfig1 \
-    libpci3 \
-    libasound2 \
-    libatspi2.0-0 \
-    libgbm1 \
-    libwayland-client0 \
-    libwayland-server0 \
-    xvfb \
-    net-tools \
+    libnotify4 \
+    libsecret-1-0 \
+    # Utilities
     wget \
     curl \
-    netcat-openbsd \
+    ca-certificates \
+    python3 \
+    python3-pip \
+    psmisc \
+    net-tools \
     procps \
     --no-install-recommends && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install ngrok (using the working method)
-RUN wget -q https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz -O ngrok.tgz && \
-    tar -xzf ngrok.tgz -C /usr/local/bin/ && \
-    rm ngrok.tgz && \
+# Install ngrok
+RUN wget -q https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz && \
+    tar -xzf ngrok-v3-stable-linux-amd64.tgz -C /usr/local/bin/ && \
+    rm ngrok-v3-stable-linux-amd64.tgz && \
     chmod +x /usr/local/bin/ngrok
 
-# Install Python packages
+# Create app directory
+WORKDIR /app
+
+# Copy Python requirements and install
 COPY requirements.txt .
 RUN pip3 install --no-cache-dir -r requirements.txt
 
-# Create application directory
-RUN mkdir -p /opt/OrganicHits
+# Copy application binary and library
+COPY organichits-exchanger .
+COPY libffmpeg.so .
 
-# Copy the application and library
-COPY organichits-exchanger /opt/OrganicHits/organichits-exchanger
-COPY libffmpeg.so /opt/OrganicHits/libffmpeg.so
+# Make binary executable
+RUN chmod +x organichits-exchanger
 
-# Make the application executable
-RUN chmod +x /opt/OrganicHits/organichits-exchanger
+# Create VNC and Fluxbox directories
+RUN mkdir -p /root/.vnc /root/.fluxbox
 
-# Create necessary directories
-RUN mkdir -p /root/.vnc && \
-    mkdir -p /root/.fluxbox && \
-    echo "session.screen0.toolbar.visible: false" > /root/.fluxbox/init
+# Configure Fluxbox (simple, minimal window manager config)
+RUN echo "session.screen0.toolbar.visible: false" > /root/.fluxbox/init && \
+    echo "session.screen0.workspaces: 1" >> /root/.fluxbox/init
 
-# Create fluxbox menu
-RUN echo '[begin] (fluxbox)' > /root/.fluxbox/menu && \
-    echo '[exec] (OrganicHits) {/opt/OrganicHits/organichits-exchanger --no-sandbox --disable-dev-shm-usage}' >> /root/.fluxbox/menu && \
-    echo '[end]' >> /root/.fluxbox/menu
-
-# Copy the application code
+# Copy Python application
 COPY app.py .
 
-# Expose the necessary ports
+# Expose ports
+# 7860: Gradio interface
+# 5901: VNC server
+# 8081: Websockify/NoVNC
 EXPOSE 7860 5901 8081
 
-# Set the entrypoint
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+    CMD curl -f http://localhost:7860/ || exit 1
+
+# Start the application
 CMD ["python3", "app.py"]