Merge branch 'staging' into release

.github/readme.md

@@ -258,6 +258,7 @@ You will need two mandatory directory mappings and a port mapping to allow Silly
 * [config] - The directory where SillyTavern configuration files will be stored on your host machine
 * [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine
 * [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine
+* [extensions] - (optional) The directory where global UI extensions will be stored on your host machine
 
 ##### Port Mappings
 
@@ -273,7 +274,7 @@ You will need two mandatory directory mappings and a port mapping to allow Silly
 1. Open your Command Line
 2. Run the following command
 
-`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
+`docker create --name='sillytavern' --net='[DockerNet]' -p '8000:8000/tcp' -v '[plugins]':'/home/node/app/plugins':'rw' -v '[config]':'/home/node/app/config':'rw' -v '[data]':'/home/node/app/data':'rw' -v '[extensions]':'/home/node/app/public/scripts/extensions/third-party':'rw' 'ghcr.io/sillytavern/sillytavern:[version]'`
 
 > Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config.
 

Dockerfile

@@ -37,6 +37,9 @@ RUN \
   echo "*** Convert line endings to Unix format ***" && \
   dos2unix "./docker-entrypoint.sh"
 
+# Fix extension repos permissions
+RUN git config --global --add safe.directory "*"
+
 EXPOSE 8000
 
 # Ensure proper handling of kernel signals

docker/docker-compose.yml

@@ -11,4 +11,5 @@ services:
       - "./config:/home/node/app/config"
       - "./data:/home/node/app/data"
       - "./plugins:/home/node/app/plugins"
+      - "./extensions:/home/node/app/public/scripts/extensions/third-party"
     restart: unless-stopped