Merge branch 'staging' into release

102d170752eb19da70966ca293f5d5a166405c55

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: f246bc5ac6eeff65de0e482bc88f22e9b55a8eac 67682645146ababe2db450ccd1b2ec5f1874398d
3 files changed, +6 -1Showing whitespace changes
.github/readme.md+2 -1
@@ -258,6 +258,7 @@ You will need two mandatory directory mappings and a port mapping to allow Silly
258* [config] - The directory where SillyTavern configuration files will be stored on your host machine258* [config] - The directory where SillyTavern configuration files will be stored on your host machine
259* [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine259* [data] - The directory where SillyTavern user data (including characters) will be stored on your host machine
260* [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine260* [plugins] - (optional) The directory where SillyTavern server plugins will be stored on your host machine
261* [extensions] - (optional) The directory where global UI extensions will be stored on your host machine
261262
262##### Port Mappings263##### Port Mappings
263264
@@ -273,7 +274,7 @@ You will need two mandatory directory mappings and a port mapping to allow Silly
2731. Open your Command Line2741. Open your Command Line
2742. Run the following command2752. Run the following command
275276
276`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]'`277`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]'`
277278
278> Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config.279> Note that 8000 is a default listening port. Don't forget to use an appropriate port if you change it in the config.
279280
Dockerfile+3 -0
@@ -37,6 +37,9 @@ RUN \
37 echo "*** Convert line endings to Unix format ***" && \37 echo "*** Convert line endings to Unix format ***" && \
38 dos2unix "./docker-entrypoint.sh"38 dos2unix "./docker-entrypoint.sh"
3939
40# Fix extension repos permissions
41RUN git config --global --add safe.directory "*"
42
40EXPOSE 800043EXPOSE 8000
4144
42# Ensure proper handling of kernel signals45# Ensure proper handling of kernel signals
docker/docker-compose.yml+1 -0
@@ -11,4 +11,5 @@ services:
11 - "./config:/home/node/app/config"11 - "./config:/home/node/app/config"
12 - "./data:/home/node/app/data"12 - "./data:/home/node/app/data"
13 - "./plugins:/home/node/app/plugins"13 - "./plugins:/home/node/app/plugins"
14 - "./extensions:/home/node/app/public/scripts/extensions/third-party"
14 restart: unless-stopped15 restart: unless-stopped