Update Dockerfile

Dockerfile

@@ -16,6 +16,7 @@ RUN apt-get update && \
         mediainfo \
         screen \
         nano \
+        rsync \
     && rm -rf /var/lib/apt/lists/*
 
 # ── Install bore ──────────────────────────────────────────────────────────────
@@ -34,7 +35,7 @@ USER root
 
 # ── Set HOME and PATH ─────────────────────────────────────────────────────────
 ENV HOME=/root \
-    PATH="/root/venv/bin:${PATH}" \
+    PATH="/root/venv/bin:/usr/local/bin:${PATH}" \
     VIRTUAL_ENV=/root/venv \
     PIP_NO_CACHE_DIR=1 \
     HOSTNAME=kanha
@@ -53,32 +54,28 @@ RUN echo 'export PS1="\u@kanha:\w\$ "' >> /root/.bashrc && \
     echo 'cd /data' >> /root/.bashrc && \
     echo 'cd /data' >> /root/.bash_profile
 
-# ── Force pip/python to always use venv (works in ALL shell types) ────────────
+# ── Force pip/python → always use /root/venv ─────────────────────────────────
 RUN printf '%s\n' \
     '#!/bin/sh' \
-    'exec /data/persist/venv/bin/pip "$@"' \
-    > /usr/local/bin/pip && \
-    chmod +x /usr/local/bin/pip && \
+    'exec /root/venv/bin/pip "$@"' \
+    > /usr/local/bin/pip && chmod +x /usr/local/bin/pip && \
     \
     printf '%s\n' \
     '#!/bin/sh' \
-    'exec /data/persist/venv/bin/pip3 "$@"' \
-    > /usr/local/bin/pip3 && \
-    chmod +x /usr/local/bin/pip3 && \
+    'exec /root/venv/bin/pip3 "$@"' \
+    > /usr/local/bin/pip3 && chmod +x /usr/local/bin/pip3 && \
     \
     printf '%s\n' \
     '#!/bin/sh' \
-    'exec /data/persist/venv/bin/python "$@"' \
-    > /usr/local/bin/python && \
-    chmod +x /usr/local/bin/python && \
+    'exec /root/venv/bin/python "$@"' \
+    > /usr/local/bin/python && chmod +x /usr/local/bin/python && \
     \
     printf '%s\n' \
     '#!/bin/sh' \
-    'exec /data/persist/venv/bin/python3 "$@"' \
-    > /usr/local/bin/python3 && \
-    chmod +x /usr/local/bin/python3
+    'exec /root/venv/bin/python3 "$@"' \
+    > /usr/local/bin/python3 && chmod +x /usr/local/bin/python3
 
-# ── apt/apt-get wrapper → intercepts install and saves to apt.txt ─────────────
+# ── apt/apt-get wrapper → saves to apt.txt ───────────────────────────────────
 RUN printf '%s\n' \
     '#!/bin/sh' \
     'APT_FILE="/data/apt.txt"' \
@@ -91,9 +88,7 @@ RUN printf '%s\n' \
     '    if [ $STATUS -eq 0 ]; then' \
     '        touch "$APT_FILE"' \
     '        for arg in "$@"; do' \
-    '            case "$arg" in' \
-    '                -*) continue ;;' \
-    '            esac' \
+    '            case "$arg" in -*) continue ;; esac' \
     '            if ! grep -qx "$arg" "$APT_FILE"; then' \
     '                echo "$arg" >> "$APT_FILE"' \
     '                echo "✓ $arg saved to apt.txt"' \
@@ -103,20 +98,17 @@ RUN printf '%s\n' \
     '    exit $STATUS' \
     'fi' \
     '"$REAL_BIN" "$@"' \
-    > /usr/local/bin/_apt_wrapper && \
-    chmod +x /usr/local/bin/_apt_wrapper
+    > /usr/local/bin/_apt_wrapper && chmod +x /usr/local/bin/_apt_wrapper
 
 RUN printf '%s\n' \
     '#!/bin/sh' \
     'exec /usr/local/bin/_apt_wrapper /usr/bin/apt "$@"' \
-    > /usr/local/bin/apt && \
-    chmod +x /usr/local/bin/apt
+    > /usr/local/bin/apt && chmod +x /usr/local/bin/apt
 
 RUN printf '%s\n' \
     '#!/bin/sh' \
     'exec /usr/local/bin/_apt_wrapper /usr/bin/apt-get "$@"' \
-    > /usr/local/bin/apt-get && \
-    chmod +x /usr/local/bin/apt-get
+    > /usr/local/bin/apt-get && chmod +x /usr/local/bin/apt-get
 
 # ── Ensure /data exists ───────────────────────────────────────────────────────
 RUN mkdir -p /data
@@ -131,32 +123,39 @@ RUN printf '%s\n' \
     '#!/bin/sh' \
     'set -e' \
     '' \
-    'persist() {' \
-    '    SRC="$1"' \
-    '    DEST="$2"' \
-    '    mkdir -p "$(dirname "$DEST")"' \
-    '    if [ ! -e "$DEST" ]; then' \
-    '        if [ -e "$SRC" ]; then' \
-    '            cp -a "$SRC" "$DEST"' \
-    '            rm -rf "$SRC"' \
-    '        else' \
-    '            mkdir -p "$DEST"' \
-    '        fi' \
-    '    else' \
-    '        rm -rf "$SRC"' \
-    '    fi' \
-    '    ln -sf "$DEST" "$SRC"' \
-    '}' \
+    'mkdir -p /data/persist' \
+    '' \
+    '# ── Step 1: RESTORE — /data/persist → /root/ (on restart) ───────────' \
+    '# Only syncs what is missing in /root/, never overwrites existing files' \
+    'if [ -d "/data/persist/venv" ]; then' \
+    '    echo "▶ Restoring venv from backup..."' \
+    '    rsync -a --ignore-existing /data/persist/venv/ /root/venv/' \
+    'fi' \
+    'if [ -d "/data/persist/cache" ]; then' \
+    '    echo "▶ Restoring cache from backup..."' \
+    '    rsync -a --ignore-existing /data/persist/cache/ /root/.cache/' \
+    'fi' \
     '' \
-    'persist /root/venv   /data/persist/venv' \
-    'persist /root/.cache /data/persist/cache' \
+    '# ── Step 2: Fix pip ─────────────────────────────────────────────────' \
+    'rm -f /root/venv/lib/python*/EXTERNALLY-MANAGED' \
     '' \
-    'rm -f /data/persist/venv/lib/python*/EXTERNALLY-MANAGED' \
+    '# ── Step 3: BACKUP — /root/ → /data/persist/ (sync any changes) ─────' \
+    '# rsync only copies what changed, very fast' \
+    'echo "▶ Syncing /root/venv to backup..."' \
+    'rsync -a --delete /root/venv/ /data/persist/venv/' \
+    'rsync -a --delete /root/.cache/ /data/persist/cache/' \
     '' \
-    'export VIRTUAL_ENV=/data/persist/venv' \
-    'export PATH="/data/persist/venv/bin:$PATH"' \
+    '# ── Step 4: Background sync every 60s (root → data) ─────────────────' \
+    '# Catches any pip installs or changes made while server is running' \
+    '(' \
+    '    while true; do' \
+    '        sleep 60' \
+    '        rsync -a --delete /root/venv/ /data/persist/venv/ 2>/dev/null' \
+    '        rsync -a --delete /root/.cache/ /data/persist/cache/ 2>/dev/null' \
+    '    done' \
+    ') &' \
     '' \
-    '# ── apt.txt: reinstall saved packages on every restart ───────────────' \
+    '# ── Step 5: apt.txt reinstall ────────────────────────────────────────' \
     'APT_FILE="/data/apt.txt"' \
     'if [ ! -f "$APT_FILE" ]; then touch "$APT_FILE"; fi' \
     'if [ -s "$APT_FILE" ]; then' \