Spaces:
Running
Running
Upload Dockerfile
Browse files- Dockerfile +204 -186
Dockerfile
CHANGED
@@ -8,7 +8,8 @@ ARG PLUGINS="" # Comma-separated list of plugin git URLs
|
|
8 |
# Add unzip for extracting the application code
|
9 |
# Keep git for potential use by scripts or future plugin updates
|
10 |
# Add wget to download the zip file
|
11 |
-
|
|
|
12 |
|
13 |
# Create app directory
|
14 |
WORKDIR ${APP_HOME}
|
@@ -59,12 +60,6 @@ RUN \
|
|
59 |
echo "build-lib.js not found, skipping Webpack build."; \
|
60 |
fi
|
61 |
|
62 |
-
# Cleanup unnecessary files (like the docker dir if it exists in the zip) and make entrypoint executable
|
63 |
-
# This block is removed as we no longer use docker-entrypoint.sh
|
64 |
-
# RUN \
|
65 |
-
# echo "*** Cleanup and Permissions ***" && \
|
66 |
-
# ...
|
67 |
-
|
68 |
# Fix potential git safe.directory issues if git commands are run later by scripts
|
69 |
RUN git config --global --add safe.directory "${APP_HOME}"
|
70 |
|
@@ -73,183 +68,206 @@ RUN chown -R node:node ${APP_HOME}
|
|
73 |
|
74 |
EXPOSE 8000
|
75 |
|
76 |
-
#
|
77 |
-
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
# Copy default
|
107 |
-
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
-
|
114 |
-
|
115 |
-
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
|
137 |
-
|
138 |
-
|
139 |
-
|
140 |
-
|
141 |
-
|
142 |
-
|
143 |
-
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
|
148 |
-
|
149 |
-
|
150 |
-
|
151 |
-
|
152 |
-
|
153 |
-
|
154 |
-
|
155 |
-
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
|
165 |
-
|
166 |
-
|
167 |
-
|
168 |
-
|
169 |
-
|
170 |
-
|
171 |
-
|
172 |
-
|
173 |
-
|
174 |
-
|
175 |
-
|
176 |
-
|
177 |
-
|
178 |
-
|
179 |
-
|
180 |
-
|
181 |
-
|
182 |
-
|
183 |
-
|
184 |
-
|
185 |
-
|
186 |
-
|
187 |
-
|
188 |
-
|
189 |
-
|
190 |
-
|
191 |
-
|
192 |
-
|
193 |
-
|
194 |
-
|
195 |
-
|
196 |
-
|
197 |
-
|
198 |
-
|
199 |
-
|
200 |
-
|
201 |
-
|
202 |
-
|
203 |
-
|
204 |
-
|
205 |
-
|
206 |
-
|
207 |
-
|
208 |
-
|
209 |
-
|
210 |
-
|
211 |
-
|
212 |
-
|
213 |
-
|
214 |
-
|
215 |
-
|
216 |
-
|
217 |
-
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
|
222 |
-
|
223 |
-
|
224 |
-
|
225 |
-
|
226 |
-
|
227 |
-
|
228 |
-
|
229 |
-
|
230 |
-
|
231 |
-
|
232 |
-
|
233 |
-
|
234 |
-
|
235 |
-
|
236 |
-
|
237 |
-
|
238 |
-
|
239 |
-
|
240 |
-
|
241 |
-
|
242 |
-
|
243 |
-
|
244 |
-
|
245 |
-
|
246 |
-
|
247 |
-
|
248 |
-
|
249 |
-
|
250 |
-
|
251 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
252 |
|
253 |
-
|
254 |
-
|
255 |
-
"]
|
|
|
8 |
# Add unzip for extracting the application code
|
9 |
# Keep git for potential use by scripts or future plugin updates
|
10 |
# Add wget to download the zip file
|
11 |
+
# Add curl for the keep-alive script
|
12 |
+
RUN apk add --no-cache gcompat tini git unzip wget curl
|
13 |
|
14 |
# Create app directory
|
15 |
WORKDIR ${APP_HOME}
|
|
|
60 |
echo "build-lib.js not found, skipping Webpack build."; \
|
61 |
fi
|
62 |
|
|
|
|
|
|
|
|
|
|
|
|
|
63 |
# Fix potential git safe.directory issues if git commands are run later by scripts
|
64 |
RUN git config --global --add safe.directory "${APP_HOME}"
|
65 |
|
|
|
68 |
|
69 |
EXPOSE 8000
|
70 |
|
71 |
+
# --- BEGIN: Create love.sh script ---
|
72 |
+
RUN printf '#!/bin/sh\n\n\
|
73 |
+
# --- BEGIN: Update SillyTavern Core at Runtime ---\n\
|
74 |
+
echo "--- Attempting to update SillyTavern Core from GitHub (staging branch) ---"\n\
|
75 |
+
if [ -d ".git" ] && [ "$(git rev-parse --abbrev-ref HEAD)" = "staging" ]; then\n\
|
76 |
+
echo "Existing staging branch found. Resetting and pulling latest changes..."\n\
|
77 |
+
git reset --hard HEAD && \\\n\
|
78 |
+
git pull origin staging || echo "WARN: git pull failed, continuing with code from build time."\n\
|
79 |
+
echo "--- SillyTavern Core update check finished. ---"\n\
|
80 |
+
else\n\
|
81 |
+
echo "WARN: .git directory not found or not on staging branch. Skipping runtime update. Code from build time will be used."\n\
|
82 |
+
fi;\n\
|
83 |
+
# --- END: Update SillyTavern Core at Runtime ---\n\
|
84 |
+
\n\
|
85 |
+
echo "--- Checking for CONFIG_YAML environment variable ---"\n\
|
86 |
+
# Ensure the CWD has correct permissions for writing config.yaml\n\
|
87 |
+
# mkdir -p ./config && chown node:node ./config; # Removed mkdir\n\
|
88 |
+
if [ -n "$CONFIG_YAML" ]; then\n\
|
89 |
+
echo "Environment variable CONFIG_YAML found. Writing to ./config.yaml (root directory)..."\n\
|
90 |
+
# Write directly to ./config.yaml in the CWD\n\
|
91 |
+
printf "%%s\\n" "$CONFIG_YAML" > ./config.yaml && \\\n\
|
92 |
+
chown node:node ./config.yaml && \\\n\
|
93 |
+
echo "Config written to ./config.yaml and permissions set successfully."\n\
|
94 |
+
# --- BEGIN DEBUG: Print the written config file ---\n\
|
95 |
+
echo '--- Verifying written ./config.yaml --- (Printing removed) '\n\
|
96 |
+
# --- END DEBUG ---\n\
|
97 |
+
else\n\
|
98 |
+
echo "Warning: Environment variable CONFIG_YAML is not set or empty. Attempting to copy default config..."\n\
|
99 |
+
# Copy default if ENV VAR is missing and the example exists\n\
|
100 |
+
if [ -f "./public/config.yaml.example" ]; then\n\
|
101 |
+
# Copy default to ./config.yaml in the CWD\n\
|
102 |
+
cp "./public/config.yaml.example" "./config.yaml" && \\\n\
|
103 |
+
chown node:node ./config.yaml && \\\n\
|
104 |
+
echo "Copied default config to ./config.yaml"\n\
|
105 |
+
else\n\
|
106 |
+
echo "Warning: Default config ./public/config.yaml.example not found."\n\
|
107 |
+
fi;\n\
|
108 |
+
fi;\n\
|
109 |
+
\n\
|
110 |
+
# --- BEGIN: Configure Git default identity at Runtime ---\n\
|
111 |
+
echo "--- Configuring Git default user identity at runtime ---"\n\
|
112 |
+
git config --global user.name "SillyTavern Sync" && \\\n\
|
113 |
+
git config --global user.email "[email protected]";\n\
|
114 |
+
echo "--- Git identity configured for runtime user. ---\n\
|
115 |
+
# --- END: Configure Git default identity at Runtime ---\n\
|
116 |
+
\n\
|
117 |
+
# --- BEGIN: Dynamically Install Plugins at Runtime ---\n\
|
118 |
+
echo "--- Checking for PLUGINS environment variable ---"\n\
|
119 |
+
if [ -n "$PLUGINS" ]; then\n\
|
120 |
+
echo "*** Installing Plugins specified in PLUGINS environment variable: $PLUGINS ***" && \\\n\
|
121 |
+
# Ensure plugins directory exists\n\
|
122 |
+
mkdir -p ./plugins && chown node:node ./plugins && \\\n\
|
123 |
+
# Set comma as delimiter\n\
|
124 |
+
IFS=',' && \\\n\
|
125 |
+
# Loop through each plugin URL\n\
|
126 |
+
for plugin_url in $PLUGINS; do\n\
|
127 |
+
# Trim leading/trailing whitespace\n\
|
128 |
+
plugin_url=$(echo "$plugin_url" | sed \'s/^[[:space:]]*//;s/[[:space:]]*$//\') && \\\n\
|
129 |
+
if [ -z "$plugin_url" ]; then continue; fi && \\\n\
|
130 |
+
# Extract plugin name\n\
|
131 |
+
plugin_name_git=$(basename "$plugin_url") && \\\n\
|
132 |
+
plugin_name=${plugin_name_git%.git} && \\\n\
|
133 |
+
plugin_dir="./plugins/$plugin_name" && \\\n\
|
134 |
+
echo "--- Installing plugin: $plugin_name from $plugin_url into $plugin_dir ---" && \\\n\
|
135 |
+
# Remove existing dir if it exists\n\
|
136 |
+
rm -rf "$plugin_dir" && \\\n\
|
137 |
+
# Clone the plugin (run as root, fix perms later)\n\
|
138 |
+
git clone --depth 1 "$plugin_url" "$plugin_dir" && \\\n\
|
139 |
+
if [ -f "$plugin_dir/package.json" ]; then\n\
|
140 |
+
echo "--- Installing dependencies for $plugin_name ---" && \\\n\
|
141 |
+
(cd "$plugin_dir" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo "WARN: Failed to install dependencies for $plugin_name";\n\
|
142 |
+
else\n\
|
143 |
+
echo "--- No package.json found for $plugin_name, skipping dependency install. ---";\n\
|
144 |
+
fi || echo "WARN: Failed to clone $plugin_name from $plugin_url, skipping...";\n\
|
145 |
+
done && \\\n\
|
146 |
+
# Reset IFS\n\
|
147 |
+
unset IFS && \\\n\
|
148 |
+
# Fix permissions for plugins directory after installation\n\
|
149 |
+
echo "--- Setting permissions for plugins directory ---" && \\\n\
|
150 |
+
chown -R node:node ./plugins && \\\n\
|
151 |
+
echo "*** Plugin installation finished. ***";\n\
|
152 |
+
else\n\
|
153 |
+
echo "PLUGINS environment variable is not set or empty, skipping runtime plugin installation."\n\
|
154 |
+
fi;\n\
|
155 |
+
# --- END: Dynamically Install Plugins at Runtime ---\n\
|
156 |
+
\n\
|
157 |
+
# --- BEGIN: Auto-configure cloud-saves plugin if secrets provided ---\n\
|
158 |
+
echo "--- Checking for cloud-saves plugin auto-configuration ---"\n\
|
159 |
+
if [ -d "./plugins/cloud-saves" ] && [ -n "$REPO_URL" ] && [ -n "$GITHUB_TOKEN" ]; then\n\
|
160 |
+
config_file="./plugins/cloud-saves/config.json" && \\\n\
|
161 |
+
echo "--- Creating config.json for cloud-saves plugin at $config_file ---" && \\\n\
|
162 |
+
printf \'{\\\\n \\\"repo_url\\\": \\\"%%s\\\",\\\\n \\\"branch\\\": \\\"main\\\",\\\\n \\\"username\\\": \\\"\\\",\\\\n \\\"github_token\\\": \\\"%%s\\\",\\\\n \\\"display_name\\\": \\\"user\\\",\\\\n \\\"is_authorized\\\": true,\\\\n \\\"last_save\\\": null,\\\\n \\\"current_save\\\": null,\\\\n \\\"has_temp_stash\\\": false,\\\\n \\\"autoSaveEnabled\\\": false,\\\\n \\\"autoSaveInterval\\\": %%s,\\\\n \\\"autoSaveTargetTag\\\": \\\"%%s\\\"\\\\n}\\\\n\' \\"$REPO_URL\\" \\"$GITHUB_TOKEN\\" "${AUTOSAVE_INTERVAL:-30}" "${AUTOSAVE_TARGET_TAG:-}" > "$config_file" && \\\n\
|
163 |
+
chown node:node "$config_file" && \\\n\
|
164 |
+
echo "*** cloud-saves plugin auto-configuration completed ***";\n\
|
165 |
+
# --- BEGIN DEBUG: Print the written config file ---\n\
|
166 |
+
echo '--- Verifying written ./plugins/cloud-saves/config.json --- (Printing removed) '\n\
|
167 |
+
# --- END DEBUG ---\n\
|
168 |
+
else\n\
|
169 |
+
if [ ! -d "./plugins/cloud-saves" ]; then\n\
|
170 |
+
echo "cloud-saves plugin not found, skipping auto-configuration."\n\
|
171 |
+
elif [ -z "$REPO_URL" ] || [ -z "$GITHUB_TOKEN" ]; then\n\
|
172 |
+
echo "REPO_URL or GITHUB_TOKEN environment variables not provided, skipping cloud-saves auto-configuration."\n\
|
173 |
+
fi;\n\
|
174 |
+
fi;\n\
|
175 |
+
# --- END: Auto-configure cloud-saves plugin ---\n\
|
176 |
+
\n\
|
177 |
+
# --- BEGIN: Dynamically Install Extensions at Runtime ---\n\
|
178 |
+
echo "--- Checking for EXTENSIONS environment variable ---"\n\
|
179 |
+
if [ -n "$EXTENSIONS" ]; then\n\
|
180 |
+
echo "*** Installing Extensions specified in EXTENSIONS environment variable: $EXTENSIONS ***" && \\\n\
|
181 |
+
# Determine extension installation directory based on INSTALL_FOR_ALL_USERS\n\
|
182 |
+
if [ "$INSTALL_FOR_ALL_USERS" = "true" ]; then\n\
|
183 |
+
ext_install_dir="./public/scripts/extensions/third-party" && \\\n\
|
184 |
+
echo "--- Installing extensions for all users (system-wide) to $ext_install_dir ---";\n\
|
185 |
+
else\n\
|
186 |
+
ext_install_dir="./data/default-user/extensions" && \\\n\
|
187 |
+
echo "--- Installing extensions for default user only to $ext_install_dir ---";\n\
|
188 |
+
fi && \\\n\
|
189 |
+
# Ensure extension directory exists\n\
|
190 |
+
mkdir -p "$ext_install_dir" && chown node:node "$ext_install_dir" && \\\n\
|
191 |
+
# Set comma as delimiter\n\
|
192 |
+
IFS=',' && \\\n\
|
193 |
+
# Loop through each extension URL\n\
|
194 |
+
for ext_url in $EXTENSIONS; do\n\
|
195 |
+
# Trim leading/trailing whitespace\n\
|
196 |
+
ext_url=$(echo "$ext_url" | sed \'s/^[[:space:]]*//;s/[[:space:]]*$//\') && \\\n\
|
197 |
+
if [ -z "$ext_url" ]; then continue; fi && \\\n\
|
198 |
+
# Extract extension name\n\
|
199 |
+
ext_name_git=$(basename "$ext_url") && \\\n\
|
200 |
+
ext_name=${ext_name_git%.git} && \\\n\
|
201 |
+
ext_dir="$ext_install_dir/$ext_name" && \\\n\
|
202 |
+
echo "--- Installing extension: $ext_name from $ext_url into $ext_dir ---" && \\\n\
|
203 |
+
# Remove existing dir if it exists\n\
|
204 |
+
rm -rf "$ext_dir" && \\\n\
|
205 |
+
# Clone the extension (run as root, fix perms later)\n\
|
206 |
+
git clone --depth 1 "$ext_url" "$ext_dir" && \\\n\
|
207 |
+
if [ -f "$ext_dir/package.json" ]; then\n\
|
208 |
+
echo "--- Installing dependencies for extension $ext_name ---" && \\\n\
|
209 |
+
(cd "$ext_dir" && npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev --force && npm cache clean --force) || echo "WARN: Failed to install dependencies for extension $ext_name";\n\
|
210 |
+
else\n\
|
211 |
+
echo "--- No package.json found for extension $ext_name, skipping dependency install. ---";\n\
|
212 |
+
fi || echo "WARN: Failed to clone extension $ext_name from $ext_url, skipping...";\n\
|
213 |
+
done && \\\n\
|
214 |
+
# Reset IFS\n\
|
215 |
+
unset IFS && \\\n\
|
216 |
+
# Fix permissions for extensions directory after installation\n\
|
217 |
+
echo "--- Setting permissions for extensions directory ---" && \\\n\
|
218 |
+
chown -R node:node "$ext_install_dir" && \\\n\
|
219 |
+
echo "*** Extension installation finished. ***";\n\
|
220 |
+
else\n\
|
221 |
+
echo "EXTENSIONS environment variable is not set or empty, skipping runtime extension installation."\n\
|
222 |
+
fi;\n\
|
223 |
+
# --- END: Dynamically Install Extensions at Runtime ---\n\
|
224 |
+
\n\
|
225 |
+
# --- BEGIN: Cleanup before start ---\n\
|
226 |
+
# Remove .gitignore\n\
|
227 |
+
echo "Attempting final removal of .gitignore..." && \\\n\
|
228 |
+
rm -f .gitignore && \\\n\
|
229 |
+
if [ ! -e .gitignore ]; then\n\
|
230 |
+
echo ".gitignore successfully removed."\n\
|
231 |
+
else\n\
|
232 |
+
# This case is unlikely with rm -f unless permissions prevent removal\n\
|
233 |
+
echo "WARN: .gitignore could not be removed or reappeared."\n\
|
234 |
+
fi;\n\
|
235 |
+
# Remove .git directory\n\
|
236 |
+
echo "Attempting final removal of .git directory..." && \\\n\
|
237 |
+
rm -rf .git && \\\n\
|
238 |
+
if [ ! -d .git ]; then\n\
|
239 |
+
echo ".git directory successfully removed."\n\
|
240 |
+
else\n\
|
241 |
+
# This case usually indicates a permission issue\n\
|
242 |
+
echo "WARN: .git directory could not be removed."\n\
|
243 |
+
fi;\n\
|
244 |
+
# --- END: Cleanup before start ---\n\
|
245 |
+
\n\
|
246 |
+
echo "Starting SillyTavern server in background..."\n\
|
247 |
+
# Execute node server directly, bypassing docker-entrypoint.sh and run in background\n\
|
248 |
+
node server.js &\n\
|
249 |
+
\n\
|
250 |
+
echo "Waiting for SillyTavern server to be available at http://localhost:8000/"\n\
|
251 |
+
# Wait for server to be up and running (health check)\n\
|
252 |
+
until curl --output /dev/null --silent --head --fail http://localhost:8000/; do\n\
|
253 |
+
echo "SillyTavern is still starting or not responding, waiting 5 seconds..."\n\
|
254 |
+
sleep 5\n\
|
255 |
+
done\n\
|
256 |
+
echo "SillyTavern server started successfully!"\n\
|
257 |
+
\n\
|
258 |
+
echo "Starting periodic keep-alive (every 30 minutes)..."\n\
|
259 |
+
# Keep-alive loop\n\
|
260 |
+
while true; do\n\
|
261 |
+
echo "Sending keep-alive request..."\n\
|
262 |
+
curl http://localhost:8000/\n\
|
263 |
+
echo "Keep-alive request sent."\n\
|
264 |
+
sleep 1800 # 30 minutes in seconds\n\
|
265 |
+
done\n\
|
266 |
+
\n\
|
267 |
+
' > ./love.sh
|
268 |
+
# Make the script executable
|
269 |
+
RUN chmod +x ./love.sh
|
270 |
+
# --- END: Create love.sh script ---
|
271 |
|
272 |
+
# Entrypoint: Run the love.sh script using tini
|
273 |
+
ENTRYPOINT ["tini", "--", "/home/node/app/love.sh"]
|
|