Upload Dockerfile

Dockerfile

@@ -40,29 +40,108 @@ RUN \
     echo "No package.json found in root, skipping base npm install."; \
   fi
 
-# Pre-compile public libraries (only if build-lib.js exists)
-RUN \
-  echo "*** Run Webpack (if build-lib.js exists) ***" && \
-  if [ -f "./build-lib.js" ]; then \
-    node "./build-lib.js"; \
-  else \
-    echo "build-lib.js not found, skipping Webpack build."; \
-  fi
-
 # Ensure the node user owns the application directory and its contents
-# Do this before COPYing the script as root
 RUN chown -R node:node ${APP_HOME}
 
-# Copy the entrypoint script and set permissions
-COPY entrypoint.sh /home/node/app/entrypoint.sh
-RUN chown node:node /home/node/app/entrypoint.sh && chmod +x /home/node/app/entrypoint.sh
-# Ensure the script uses Unix line endings (LF) instead of Windows (CRLF)
-RUN sed -i 's/\r$//' /home/node/app/entrypoint.sh
-
 # Switch to non-root user
 USER node
 
 EXPOSE 8000
 
-# Entrypoint: Use tini to launch the script
-ENTRYPOINT ["tini", "--", "/home/node/app/entrypoint.sh"]
+# Entrypoint: Install plugins, Read config, Configure git, Run server
+# Using shell form for ENTRYPOINT to avoid potential JSON parsing issues
+ENTRYPOINT tini -- sh -c '
+    # --- BEGIN: Install Plugins at Runtime --- 
+    if [ -n "$PLUGINS" ]; then 
+      echo "--- Found PLUGINS environment variable, attempting to install plugins ---"; 
+      # Ensure plugin dir exists 
+      mkdir -p plugins; 
+      # Use temp var and add trailing comma for loop robustness 
+      temp_plugins_var="$PLUGINS,"; 
+      while [ -n "$temp_plugins_var" ]; do 
+        plugin_url="${temp_plugins_var%%,*}"; # Get first element 
+        temp_plugins_var="${temp_plugins_var#*,}"; # Remove first element 
+        
+        # Trim leading/trailing whitespace using awk 
+        plugin_url=$(echo "$plugin_url" | awk '''{$1=$1;print}'''); 
+        
+        if [ -z "$plugin_url" ]; then continue; fi; 
+        
+        # Extract plugin name: remove .git suffix, then get basename 
+        plugin_name_tmp="${plugin_url%.git}"; 
+        plugin_name="${plugin_name_tmp##*/}"; 
+        
+        if [ -z "$plugin_name" ]; then 
+          echo "WARN: Could not extract plugin name from URL: $plugin_url, skipping."; 
+          continue; 
+        fi; 
+        
+        plugin_dir="./plugins/$plugin_name"; 
+        echo "--- Processing plugin: $plugin_name from $plugin_url ---"; 
+        
+        # Clone (remove existing first) 
+        rm -rf "$plugin_dir"; 
+        echo "Cloning into $plugin_dir..."; 
+        if git clone --depth 1 "$plugin_url" "$plugin_dir"; then 
+          echo "Cloned successfully."; 
+          # Install dependencies if package.json exists 
+          if [ -f "$plugin_dir/package.json" ]; then 
+            echo "Found package.json, installing dependencies for $plugin_name..."; 
+            # Run npm install within the plugin directory 
+            (cd "$plugin_dir" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force); 
+            if [ $? -ne 0 ]; then 
+                echo "WARN: Failed to install dependencies for $plugin_name"; 
+            else 
+                echo "Dependencies installed for $plugin_name."; 
+            fi; 
+          else 
+            echo "No package.json found for $plugin_name, skipping dependency install."; 
+          fi; 
+        else 
+          echo "WARN: Failed to clone $plugin_name from $plugin_url, skipping further processing."; 
+        fi; 
+      done; 
+      echo "--- Finished processing plugins ---"; 
+    else 
+      echo "--- PLUGINS environment variable not set or empty, skipping plugin installation ---"; 
+    fi; 
+    # --- END: Install Plugins at Runtime --- 
+    
+    # --- Original Entrypoint logic --- 
+    echo "--- Checking for CONFIG_YAML environment variable ---"; 
+    # Ensure the CWD has correct permissions for writing config.yaml 
+    # mkdir -p ./config && chown node:node ./config; # Removed mkdir 
+    if [ -n "$CONFIG_YAML" ]; then 
+      echo "Environment variable CONFIG_YAML found. Writing to ./config.yaml (root directory)..."; 
+      # Write directly to ./config.yaml in the CWD 
+      # Need to ensure node user has write permission here. CWD should be owned by node due to chown and USER node. 
+      printf '%s\n' "$CONFIG_YAML" > ./config.yaml && 
+      echo "Config written to ./config.yaml successfully."; 
+      # --- BEGIN DEBUG: Print the written config file --- 
+      echo "--- Verifying written ./config.yaml ---"; 
+      cat ./config.yaml; 
+      echo "--- End of ./config.yaml ---"; 
+      # --- 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 
+      if [ -f "./public/config.yaml.example" ]; then 
+          # Copy default to ./config.yaml in the CWD 
+          cp "./public/config.yaml.example" "./config.yaml" && 
+          echo "Copied default config to ./config.yaml"; 
+      else 
+          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. Since we used USER node, this should run as the node user. 
+    exec node server.js; 
+'