diff --git a/.gitignore b/.gitignore index 945d00cfd..635f8d346 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ public/stats.json /uploads/ *.jsonl /config.conf -/docker/config.conf +/docker/config .DS_Store public/settings.json /thumbnails diff --git a/Dockerfile b/Dockerfile index f692c9245..1bfe92284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,13 +23,17 @@ COPY . ./ # Copy default chats, characters and user avatars to .default folder RUN \ - IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,settings.json" && \ + IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds" && \ \ echo "*** Store default $RESOURCES in .default ***" && \ for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \ \ echo "*** Create symbolic links to config directory ***" && \ for R in $RESOURCES; do ln -s "../config/$R" "public/$R"; done && \ + # rm "config.conf" "public/settings.json" "public/css/bg_load.css" && \ + ln -s "./config/config.conf" "config.conf" && \ + ln -s "../config/settings.json" "public/settings.json" && \ + ln -s "../../config/bg_load.css" "public/css/bg_load.css" && \ mkdir "config" # Cleanup unnecessary files diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 38a86f54b..38d2d864e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,5 +9,4 @@ services: - "8000:8000" volumes: - "./config:/home/node/app/config" - - "./config.conf:/home/node/app/config.conf" restart: unless-stopped diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 186905cd2..36f53342e 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh # Initialize missing user files -IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds,settings.json" +IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds" for R in $RESOURCES; do if [ ! -e "config/$R" ]; then echo "Resource not found, copying from defaults: $R" @@ -9,5 +9,20 @@ for R in $RESOURCES; do fi done +if [ ! -e "config/config.conf" ]; then + echo "Resource not found, copying from defaults: config.conf" + cp -r "default/config.conf" "config/config.conf" +fi + +if [ ! -e "config/settings.json" ]; then + echo "Resource not found, copying from defaults: settings.json" + cp -r "default/settings.json" "config/settings.json" +fi + +if [ ! -e "config/bg_load.css" ]; then + echo "Resource not found, copying from defaults: bg_load.css" + cp -r "default/bg_load.css" "config/bg_load.css" +fi + # Start the server exec node server.js