rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Dockerfile

Browse Source 
- Added changing permission for entrypoint script.
- Changed moving of default characters, chats and user avatars.
This commit is contained in:
Mindus
2023-01-25 20:58:51 +01:00
parent b8d7706752
commit a8ea6d621c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -19,8 +19,8 @@ COPY . .
# Copy default chats, characters and user avatars to <folder>.default folder # Copy default chats, characters and user avatars to <folder>.default folder
RUN \ RUN \
echo "*** Copy default chats, characters and user avatars to <folder>.default folder ***" && \ echo "*** Copy default chats, characters and user avatars to <folder>.default folder ***" && \
mv "./public/chats" "./public/chats.default" && \
mv "./public/characters" "./public/characters.default" && \ mv "./public/characters" "./public/characters.default" && \
mv "./public/chats" "./public/chats.default" && \
mv "./public/User Avatars" "./public/User Avatars.default" mv "./public/User Avatars" "./public/User Avatars.default"
# Cleanup unnecessary files # Cleanup unnecessary files
@@ -28,7 +28,9 @@ RUN \
echo "*** Cleanup ***" && \ echo "*** Cleanup ***" && \
mv "./docker/docker-entrypoint.sh" "./" && \ mv "./docker/docker-entrypoint.sh" "./" && \
rm -rf "./docker" && \ rm -rf "./docker" && \
rm -rf "./.git" rm -rf "./.git" && \
echo "*** Make docker-entrypoint.sh executable ***" && \
chmod +x "./docker-entrypoint.sh"
EXPOSE 8000 EXPOSE 8000

9
docker/docker-entrypoint.sh
View File

@@ -3,19 +3,22 @@
# Check if the "characters" directory is empty # Check if the "characters" directory is empty
if [ -z "$(ls -A /home/node/app/public/characters)" ]; then if [ -z "$(ls -A /home/node/app/public/characters)" ]; then
echo "Characters directory is empty. Copying default characters." echo "Characters directory is empty. Copying default characters."
mv /home/node/app/public/characters.default/ /home/node/app/public/characters/ mv /home/node/app/public/characters.default/* /home/node/app/public/characters/
rm -rf /home/node/app/public/characters.default
fi fi
# Check if the "chats" directory is empty # Check if the "chats" directory is empty
if [ -z "$(ls -A /home/node/app/public/chats)" ]; then if [ -z "$(ls -A /home/node/app/public/chats)" ]; then
echo "Chats directory is empty. Copying default chats." echo "Chats directory is empty. Copying default chats."
mv /home/node/app/public/chats.default/ /home/node/app/public/chats/ mv /home/node/app/public/chats.default/* /home/node/app/public/chats/
rm -rf /home/node/app/public/chats.default
fi fi
# Check if the "User Avatars" directory is empty # Check if the "User Avatars" directory is empty
if [ -z "$(ls -A '/home/node/app/public/User Avatars')" ]; then if [ -z "$(ls -A '/home/node/app/public/User Avatars')" ]; then
echo "User Avatars directory is empty. Copying default user avatars." echo "User Avatars directory is empty. Copying default user avatars."
mv /home/node/app/public/User\ Avatars.default/ '/home/node/app/public/User Avatars/' mv /home/node/app/public/User\ Avatars.default/* '/home/node/app/public/User Avatars/'
rm -rf /home/node/app/public/User\ Avatars.default
fi fi
# Start the server # Start the server