Update Dockerfile

Dockerfile

@@ -1,104 +1,85 @@
 FROM ubuntu:22.04
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV TERM=xterm-256color
-ENV NPM_CONFIG_PREFIX=/home/Draco/.npm-global
-ENV PATH=$PATH:/home/Draco/.npm-global/bin
-
-# Create sudoers.d directory, user Draco with passwordless sudo and npm global folder
-RUN mkdir -p /etc/sudoers.d && \
-    useradd -m -u 1000 -s /bin/bash Draco && \
-    echo "Draco ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/draco && \
-    chmod 440 /etc/sudoers.d/draco && \
-    mkdir -p /home/Draco/.npm-global && chown -R Draco:Draco /home/Draco/.npm-global
-
-# Install curl, gnupg, and add NodeSource Node.js 20 repo
-RUN apt-get update && apt-get install -y curl gnupg && apt-get clean
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
-
-# Install Node.js, Tailscale, Python, and tools (no tmate)
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    nodejs \
-    ffmpeg \
-    python3 python3-pip python3-venv \
-    build-essential \
-    openssh-client \
-    neofetch \
-    git \
-    wget \
-    vim \
-    nano \
-    unzip \
-    zip \
-    htop \
-    net-tools \
-    iputils-ping \
-    dnsutils \
-    tmux \
-    screen \
-    jq \
-    ca-certificates \
-    software-properties-common \
-    sqlite3 \
-    libsqlite3-dev \
-    libssl-dev \
-    libffi-dev \
-    libxml2-dev \
-    libxslt1-dev \
-    libjpeg-dev \
-    zlib1g-dev \
-    libpng-dev \
-    libwebp-dev \
-    pkg-config \
-    rsync \
-    lsof \
-    sudo \
-    gnupg \
-    openssl \
-    tree \
-    mc \
-    python3-dev \
-    python3-distutils \
-    python3-setuptools \
-    cron \
-    aria2 \
-    telnet \
-    expect && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install Python packages globally
-RUN pip3 install --no-cache-dir \
-    pytelegrambotapi \
-    requests \
-    beautifulsoup4 \
-    lxml \
-    flask \
-    httpx \
-    aiohttp \
-    schedule
-
-# Install Tailscale
-RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null && \
-    curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.list | tee /etc/apt/sources.list.d/tailscale.list >/dev/null && \
-    apt-get update && apt-get install -y tailscale && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Create app directory
-RUN mkdir -p /app && echo "Server is running..." > /app/index.html && \
-    chown -R Draco:Draco /app
-
-WORKDIR /app
-
-# Switch to Draco user
-USER Draco
-
-# Show key version numbers
-RUN node -v && npm -v && python3 --version && ffmpeg -version
-
-# Expose HTTP server port
-EXPOSE 7860
-
-# Start Python HTTP server and Tailscale userspace daemon
-CMD python3 -m http.server 7860 & \
-    tailscaled --tun=userspace-networking --socks5-server=localhost:1055 > /dev/null 2>&1 & \
-    sleep 3 && tailscale up --ssh --netfilter-mode=off || echo "tailscale failed"
+ENV DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8
+
+Install system packages including LXDE and XRDP
+
+RUN apt update && apt upgrade -y && 
+apt install -y 
+sudo 
+curl 
+wget 
+git 
+gnupg 
+openssh-client 
+neofetch 
+tmate 
+python3 
+python3-pip 
+ca-certificates 
+software-properties-common 
+build-essential 
+procps 
+xz-utils 
+net-tools 
+make 
+ffmpeg 
+nano 
+vim 
+htop 
+unzip 
+zip 
+iputils-ping 
+tree 
+lsof 
+netcat 
+tmux 
+locales 
+lxde 
+xrdp && 
+locale-gen en_US.UTF-8 && 
+apt clean && rm -rf /var/lib/apt/lists/*
+
+Configure XRDP to use LXDE session
+
+RUN sed -i 's|port=3389|port=3389|g' /etc/xrdp/xrdp.ini && 
+echo "lxsession -s LXDE -e LXDE" > /etc/xrdp/startwm.sh && 
+chmod +x /etc/xrdp/startwm.sh
+
+Install Node.js v22 and npm
+
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && 
+apt update && apt install -y nodejs && 
+npm install -g npm && 
+apt clean && rm -rf /var/lib/apt/lists/*
+
+Install speedtest-cli
+
+RUN pip3 install --no-cache-dir speedtest-cli
+
+Create user 'draco' with sudo rights and fixed UID
+
+RUN useradd -m -s /bin/bash -u 1000 draco && 
+echo "draco:draco" | chpasswd && 
+usermod -aG sudo draco
+
+Setup SSH keys for draco user
+
+RUN mkdir -p /home/draco/.ssh && 
+ssh-keygen -t rsa -f /home/draco/.ssh/id_rsa -N '' && 
+chown -R draco:draco /home/draco/.ssh
+
+USER draco WORKDIR /home/draco
+
+Create tmate auto-reconnect launcher
+
+RUN cat << 'EOF' > run_tmate.sh #!/bin/bash while true; do echo "[tmate-log] Launching new tmate session..." | tee tmate.txt tmate -S /tmp/tmate.sock new-session -d tmate -S /tmp/tmate.sock wait tmate-ready echo "[tmate-log] SSH: $(tmate -S /tmp/tmate.sock display -p "#{tmate_ssh}")" | tee -a tmate.txt echo "[tmate-log] Web: $(tmate -S /tmp/tmate.sock display -p "#{tmate_web}")" | tee -a tmate.txt echo "[tmate-log] Monitoring connection..." | tee -a tmate.txt while pgrep -f "tmate -S /tmp/tmate.sock" > /dev/null; do sleep 5; done echo "[tmate-log] ⚠️ Connection lost. Reconnecting in 5 seconds..." | tee -a tmate.txt sleep 5 done EOF RUN chmod +x run_tmate.sh
+
+Expose RDP and Hugging Face web port
+
+EXPOSE 3389 7890
+
+Start tmate loop and simple HTTP server on port 7890
+
+CMD ["bash", "-c", "./run_tmate.sh & python3 -m http.server 7890"]
+