Update Dockerfile

Dockerfile

@@ -1,44 +1,34 @@
 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
+ENV PATH="/usr/local/bin:${PATH}"
 
-# Create user Draco with passwordless sudo
-RUN apt-get update && apt-get install -y sudo curl gnupg apt-transport-https && apt-get clean && \
-    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 Node.js 20, ffmpeg, python3, pip and other tools
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
-    apt-get update && apt-get install -y --no-install-recommends \
-    nodejs ffmpeg python3 python3-pip build-essential openssh-client git 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 required dependencies
+RUN apt-get update && apt-get install -y \
+    curl gnupg2 sudo lsb-release iproute2 \
+    python3 python3-pip python3-venv \
+    ca-certificates iputils-ping \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install Tailscale
-RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | gpg --dearmor -o /usr/share/keyrings/tailscale-archive-keyring.gpg && \
-    echo "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/ubuntu jammy main" | tee /etc/apt/sources.list.d/tailscale.list && \
-    apt-get update && apt-get install -y tailscale && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Prepare /app directory owned by Draco
-RUN mkdir -p /app && echo "Tailscale Session Running..." > /app/index.html && chown -R Draco:Draco /app
+RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg > /dev/null \
+ && curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.tailscale-keyring.list \
+ | sed 's/^deb /deb [signed-by=\/usr\/share\/keyrings\/tailscale-archive-keyring.gpg] /' \
+ | tee /etc/apt/sources.list.d/tailscale.list \
+ && apt-get update \
+ && apt-get install -y tailscale \
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Create Draco user
+RUN useradd -m -u 1000 -s /bin/bash Draco \
+ && echo "Draco ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/draco \
+ && chmod 0440 /etc/sudoers.d/draco
 
-WORKDIR /app
 USER Draco
+WORKDIR /home/Draco
 
-EXPOSE 7860
-
-# Hardcode your auth key here:
-ENV TAILSCALE_AUTHKEY="tskey-auth-krBh6cJ4GS11CNTRL-Ys653FbsA8VzjZbm7CdD8Vy4C1iCpmh2"
-
-CMD tailscaled --state=/tmp/tailscaled.state --socket=/tmp/tailscaled.sock & \
-    sleep 5 && \
-    tailscale --socket=/tmp/tailscaled.sock up --authkey=$TAILSCALE_AUTHKEY --accept-routes --accept-dns && \
-    python3 -m http.server 7860 && tail -f /dev/null
+# Start tailscaled silently in userspace mode, bring up with auth key, and run web server
+CMD tailscaled --tun=userspace-networking --socks5-server=localhost:1055 > /dev/null 2>&1 & \
+ && sleep 2 \
+ && tailscale up --authkey=tskey-auth-krBh6cJ4GS11CNTRL-Ys653FbsA8VzjZbm7CdD8Vy4C1iCpmh2 --ssh --netfilter-mode=off > /dev/null 2>&1 \
+ && python3 -m http.server 7860