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

Browse Source 
- Automatic change of windows line endings when building docker image
- Creating characters, chats, avatars folders before adding defaults
This commit is contained in:
Mindus
2023-01-28 13:19:02 +01:00
parent a8ea6d621c
commit 1bf922d395
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -6,7 +6,6 @@ ARG APP_HOME=/home/node/app
# Create app directory # Create app directory
WORKDIR ${APP_HOME} WORKDIR ${APP_HOME}
# Install app dependencies # Install app dependencies
COPY package*.json ./ COPY package*.json ./
RUN \ RUN \
@ -14,7 +13,7 @@ RUN \
npm install npm install
# Bundle app source # Bundle app source
COPY . . 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 \
@ -30,7 +29,9 @@ RUN \
rm -rf "./docker" && \ rm -rf "./docker" && \
rm -rf "./.git" && \ rm -rf "./.git" && \
echo "*** Make docker-entrypoint.sh executable ***" && \ echo "*** Make docker-entrypoint.sh executable ***" && \
chmod +x "./docker-entrypoint.sh" chmod +x "./docker-entrypoint.sh" && \
echo "*** Convert line endings to Unix format ***" && \
dos2unix "./docker-entrypoint.sh"
EXPOSE 8000 EXPOSE 8000

5
docker/docker-entrypoint.sh
View File

@ -3,6 +3,7 @@
# 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."
mkdir /home/node/app/public/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 rm -rf /home/node/app/public/characters.default
fi fi
@ -10,6 +11,7 @@ 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."
mkdir /home/node/app/public/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 rm -rf /home/node/app/public/chats.default
fi fi
@ -17,7 +19,8 @@ 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/' mkdir /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 rm -rf /home/node/app/public/User\ Avatars.default
fi fi