Update Dockerfile

Dockerfile

@@ -5,120 +5,40 @@ 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 && \
+# 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
+    mkdir -p /home/Draco/.npm-global && chown -R Draco:Draco /home/Draco/.npm-global
 
-# Install curl, gnupg, apt-transport-https for repos
-RUN apt-get update && \
-    apt-get install -y curl gnupg apt-transport-https && \
-    apt-get clean
-
-# Add NodeSource repo and install Node.js 20
-RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
-
-# Install required packages (excluding tmate since replaced with tailscale)
-RUN 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 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
+RUN pip3 install --no-cache-dir pytelegrambotapi requests beautifulsoup4 lxml flask httpx aiohttp schedule
 
-# Install Tailscale official repo and install tailscale
-RUN curl -fsSL https://pkgs.tailscale.com/stable/ubuntu/jammy.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg > /dev/null && \
+# 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/*
-
-# Generate SSH keys for root (if needed)
-RUN mkdir -p /root/.ssh && \
-    ssh-keygen -t rsa -f /root/.ssh/id_rsa -N '' && \
-    chmod 700 /root/.ssh && \
-    chmod 600 /root/.ssh/id_rsa
-
-# Create /dev/ptmx if missing to avoid crashes (permission 666)
-RUN if [ ! -c /dev/ptmx ]; then \
-        mknod /dev/ptmx c 5 2 && chmod 666 /dev/ptmx ; \
-    fi
-
-# Create /dev/pts directory (empty, since mounting devpts is not possible here)
-RUN mkdir -p /dev/pts
+    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 mkdir -p /app && echo "Tailscale Session Running..." > /app/index.html && chown -R Draco:Draco /app
 
 WORKDIR /app
-
-# Ensure Draco user can run tailscale (by adding to sudoers and correct PATH)
-# Actually, Draco is already sudoer (NOPASSWD), so can run 'sudo tailscale' easily.
-
 USER Draco
 
-# Optional: verify versions
-RUN node -v && npm -v && python3 --version && ffmpeg -version && tailscale version
+EXPOSE 7860
+
+# Hardcode your auth key here:
+ENV TAILSCALE_AUTHKEY="tskey-auth-krBh6cJ4GS11CNTRL-Ys653FbsA8VzjZbm7CdD8Vy4C1iCpmh2"
 
-# Default CMD — you might want to start tailscaled in background as root outside container or manually.
-CMD python3 -m http.server 7860 & sudo tailscaled --state=/tmp/tailscaled.state & tailscale up --authkey=${TAILSCALE_AUTHKEY:-} --accept-routes --accept-dns || echo "tailscale failed" && tail -f /dev/null
+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