Update Dockerfile

Dockerfile

@@ -1,75 +1,57 @@
 # ─── Base ──────────────────────────────────────────────────────────────────
 FROM ubuntu:22.04
 
-# Prevent interactive prompts from any apt/dpkg step
 ENV DEBIAN_FRONTEND=noninteractive
 ENV PYTHONUNBUFFERED=1
 ENV PIP_ROOT_USER_ACTION=ignore
 
-# ─── System packages ────────────────────────────────────────────────────────
-# All tools a user might need from a web terminal
+# ─── System packages (NO nodejs/npm here — installed via NodeSource below) ──
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    # Shell & editors
     bash bash-completion nano vim less \
-    # Process & session management
     tmux screen htop procps \
-    # Python
     python3 python3-pip python3-venv python3-dev \
-    # Node / npm (latest LTS via NodeSource added below)
-    nodejs npm \
-    # Network tools
     curl wget git netcat-openbsd dnsutils iputils-ping \
-    # Build tools (for pip packages that compile)
     build-essential gcc g++ make \
-    # Archive tools
     zip unzip tar gzip bzip2 xz-utils \
-    # Text / data utils
     jq bc sed gawk \
-    # SSL
-    ca-certificates \
-    # Locale
-    locales \
+    ca-certificates locales \
     && rm -rf /var/lib/apt/lists/*
 
 # ─── Locale ─────────────────────────────────────────────────────────────────
 RUN locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
 
-# ─── Node.js LTS (v20) via NodeSource ───────────────────────────────────────
-# Gives a modern npm without the outdated Ubuntu package
+# ─── Node.js 20 LTS via NodeSource ──────────────────────────────────────────
+# Key: do NOT pre-install nodejs/npm above — zero package conflict this way.
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && node --version && npm --version
 
-# ─── Python virtual environment ──────────────────────────────────────────────
-# Keeps system Python clean; no --break-system-packages ever needed
+# ─── Python venv (pip works with no extra flags ever) ────────────────────────
 RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
-# Make pip fast and quiet
 RUN pip install --upgrade pip setuptools wheel
 
-# ─── App setup ──────────────────────────────────────────────────────────────
+# ─── Workspace & app dirs ────────────────────────────────────────────────────
 RUN mkdir -p /workspace /app && chmod 777 /workspace
-
 WORKDIR /app
 
-# Copy & install Python requirements first (layer cache)
+# ─── Python deps (cached layer) ──────────────────────────────────────────────
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy application source
+# ─── App source ──────────────────────────────────────────────────────────────
 COPY . .
 
-# ─── Bash config for /workspace ─────────────────────────────────────────────
-RUN echo 'export PS1="\[\e[38;5;40m\]\u\[\e[0m\]@\[\e[38;5;33m\]webterminal\[\e[0m\]:\[\e[38;5;33m\]\w\[\e[0m\]\$ "' >> /root/.bashrc \
-    && echo 'alias ll="ls -lah --color=auto"' >> /root/.bashrc \
-    && echo 'alias la="ls -A"'                >> /root/.bashrc \
-    && echo 'alias py="python3"'              >> /root/.bashrc \
-    && echo 'cd /workspace'                   >> /root/.bashrc
+# ─── Nice shell defaults ──────────────────────────────────────────────────────
+RUN printf '%s\n' \
+    'export PS1="\[\e[38;5;40m\]\u\[\e[0m\]@\[\e[38;5;33m\]webterminal\[\e[0m\]:\[\e[38;5;33m\]\w\[\e[0m\]\$ "' \
+    'alias ll="ls -lah --color=auto"' \
+    'alias la="ls -A"' \
+    'alias py="python3"' \
+    'cd /workspace' \
+    >> /root/.bashrc
 
-# ─── Port ──────��────────────────────────────────────────────────────────────
 EXPOSE 7860
-
-# ─── Run ────────────────────────────────────────────────────────────────────
-# gevent handles async WebSockets efficiently
-CMD ["python", "app.py"]
+CMD ["python", "app.py"]