Upload 2 files

Dockerfile

@@ -2,11 +2,13 @@ FROM node:lts-alpine3.19
 
 # Arguments
 ARG APP_HOME=/home/node/app
+ARG PLUGINS="" # Comma-separated list of plugin git URLs
 
 # Install system dependencies
 # Add unzip for extracting the application code
 # Keep git for potential use by scripts or future plugin updates
-RUN apk add --no-cache gcompat tini git unzip
+# Add wget to download the zip file
+RUN apk add --no-cache gcompat tini git unzip wget
 
 # Create app directory
 WORKDIR ${APP_HOME}
@@ -14,12 +16,13 @@ WORKDIR ${APP_HOME}
 # Set NODE_ENV to production
 ENV NODE_ENV=production
 
-# Copy the zip file from the build context
-COPY sillytavern.zip .
+# --- BEGIN: Clone SillyTavern Core from GitHub (staging branch) ---
 RUN \
-  echo "*** Unzipping SillyTavern Core ***" && \
-  unzip -q sillytavern.zip && \
-  rm sillytavern.zip
+  echo "*** Cloning SillyTavern Core from GitHub (staging branch) ***" && \
+  # Clone the specific branch into the current directory
+  git clone -b staging --depth 1 https://github.com/SillyTavern/SillyTavern.git . && \
+  echo "*** Cloning complete. ***"
+# --- END: Clone SillyTavern Core ---
 
 # --- BEGIN: Remove root .gitignore if exists ---
 RUN \
@@ -28,28 +31,37 @@ RUN \
   echo "*** Root .gitignore removed (if it existed). ***"
 # --- END: Remove root .gitignore ---
 
-# --- BEGIN: Clone or Update data-sync plugin ---
+# --- BEGIN: Dynamically Clone Plugins from PLUGINS argument ---
 RUN \
-  echo "*** Checking data-sync plugin ***" && \
-  if [ -d "plugins/data-sync/.git" ]; then \
-    # Directory exists and is a git repository, try to update
-    echo "data-sync directory exists, attempting git pull..." && \
-    cd plugins/data-sync && \
-    # Reset any local changes before pulling
-    git reset --hard HEAD && \
-    git pull origin main --rebase --autostash && \
-    cd ${APP_HOME}; \
+  if [ -n "$PLUGINS" ]; then \
+    echo "*** Cloning Plugins specified in PLUGINS argument: $PLUGINS ***" && \
+    apk add --no-cache --virtual .build-deps-parsing basename && \
+    # Set comma as delimiter
+    IFS=',' && \
+    # Loop through each plugin URL
+    for plugin_url in $PLUGINS; do \
+      # Trim leading/trailing whitespace (using sh compatible method)
+      plugin_url=$(echo "$plugin_url" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
+      if [ -z "$plugin_url" ]; then continue; fi && \
+      # Extract plugin name (basename of the URL, removing .git suffix)
+      plugin_name=$(basename "$plugin_url" .git) && \
+      plugin_dir="plugins/$plugin_name" && \
+      echo "--- Cloning $plugin_name from $plugin_url into $plugin_dir ---" && \
+      # Remove existing dir if it exists
+      rm -rf "$plugin_dir" && \
+      mkdir -p plugins && \
+      # Clone the plugin
+      git clone --depth 1 "$plugin_url" "$plugin_dir" || echo "WARN: Failed to clone $plugin_name from $plugin_url, skipping..."; \
+    done && \
+    # Reset IFS
+    unset IFS && \
+    apk del .build-deps-parsing; \
   else \
-    # Directory does not exist or is not a git repo, clone it
-    echo "data-sync directory not found or invalid, cloning..." && \
-    # Remove potentially incomplete/invalid directory first
-    rm -rf plugins/data-sync && \
-    mkdir -p plugins && \
-    git clone https://github.com/fuwei99/data-sync.git plugins/data-sync; \
+    echo "PLUGINS argument is empty or not set, skipping plugin cloning."; \
   fi
-# --- END: Clone or Update data-sync plugin ---
+# --- END: Dynamically Clone Plugins ---
 
-# Install base SillyTavern dependencies (package*.json should be in the unzipped root)
+# Install base SillyTavern dependencies (package*.json should be in the cloned root)
 RUN \
   echo "*** Install Base npm packages ***" && \
   if [ -f package.json ]; then \
@@ -59,24 +71,34 @@ RUN \
     echo "No package.json found in root, skipping base npm install."; \
   fi
 
-# Install data-sync plugin dependencies
+# --- BEGIN: Dynamically Install Dependencies for Cloned Plugins ---
 RUN \
-  # Check if plugins/data-sync directory exists (it should now)
-  if [ -d "plugins/data-sync" ]; then \
-    echo "*** Install data-sync plugin npm packages ***" && \
-    cd plugins/data-sync && \
-    if [ -f package.json ]; then \
-      # Added --force
-      npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force; \
-    else \
-      echo "No package.json found in data-sync, skipping npm install."; \
-    fi && \
-    cd ${APP_HOME}; \
+  if [ -n "$PLUGINS" ]; then \
+    echo "*** Installing Dependencies for specified plugins ***" && \
+    apk add --no-cache --virtual .build-deps-parsing basename && \
+    IFS=',' && \
+    for plugin_url in $PLUGINS; do \
+      plugin_url=$(echo "$plugin_url" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//') && \
+      if [ -z "$plugin_url" ]; then continue; fi && \
+      plugin_name=$(basename "$plugin_url" .git) && \
+      plugin_dir="plugins/$plugin_name" && \
+      if [ -d "$plugin_dir" ] && [ -f "$plugin_dir/package.json" ]; then \
+        echo "--- Installing dependencies for $plugin_name in $plugin_dir ---" && \
+        cd "$plugin_dir" && \
+        npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force && \
+        cd "${APP_HOME}"; \
+      elif [ -d "$plugin_dir" ]; then \
+        echo "--- No package.json found in $plugin_name, skipping dependency install. ---"; \
+      else \
+        echo "--- Plugin directory $plugin_dir not found (likely clone failed), skipping dependency install. ---"; \
+      fi; \
+    done && \
+    unset IFS && \
+    apk del .build-deps-parsing; \
   else \
-    # This else block should ideally not be reached now
-    echo "Error: plugins/data-sync directory not found after attempting clone."; \
-    exit 1; \
+    echo "PLUGINS argument is empty or not set, skipping plugin dependency installation."; \
   fi
+# --- END: Dynamically Install Dependencies ---
 
 # Go back to the main app directory (redundant but safe)
 WORKDIR ${APP_HOME}
@@ -121,11 +143,11 @@ ENTRYPOINT ["tini", "--", "sh", "-c", " \
       printf '%s\n' \"$CONFIG_YAML\" > ./config.yaml && \
       chown node:node ./config.yaml && \
       echo 'Config written to ./config.yaml and permissions set successfully.'; \
-      # --- BEGIN DEBUG: Print the written config file --- 
+      # --- BEGIN DEBUG: Print the written config file ---
       echo '--- Verifying written ./config.yaml ---'; \
       cat ./config.yaml; \
       echo '--- End of ./config.yaml ---'; \
-      # --- END DEBUG --- 
+      # --- END DEBUG ---
     else \
       echo 'Warning: Environment variable CONFIG_YAML is not set or empty. Attempting to copy default config...'; \
       # Copy default if ENV VAR is missing and the example exists
@@ -138,14 +160,14 @@ ENTRYPOINT ["tini", "--", "sh", "-c", " \
           echo 'Warning: Default config ./public/config.yaml.example not found.'; \
       fi; \
     fi; \
-    
+
     # --- BEGIN: Configure Git default identity at Runtime ---
     echo '--- Configuring Git default user identity at runtime ---'; \
     git config --global user.name \"SillyTavern Sync\" && \
     git config --global user.email \"sillytavern-sync@example.com\"; \
     echo '--- Git identity configured for runtime user. ---'; \
     # --- END: Configure Git default identity at Runtime ---
-    
+
     echo 'Starting SillyTavern server directly...'; \
     # Execute node server directly, bypassing docker-entrypoint.sh
     exec node server.js; \