eggacheb commited on
Commit
3842066
1 Parent(s): b324027

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +15 -4
Dockerfile CHANGED
@@ -13,9 +13,15 @@ ENTRYPOINT [ "tini", "--" ]
13
  WORKDIR ${APP_HOME}
14
  RUN mkdir -p /app/config/
15
  RUN mkdir -p /app/public/
 
 
 
 
16
  RUN chmod -R 777 /app/config/
17
  RUN chmod -R 777 /app/public/
18
-
 
 
19
 
20
 
21
  # Env
@@ -41,18 +47,20 @@ ENV github_secret ""
41
  ENV github_project ""
42
 
43
  # Install app dependencies
44
- RUN git clone https://github.com/SillyTavern/SillyTavern.git --branch 1.11.7
 
45
  RUN \
46
  echo "*** Install npm packages ***" && \
47
  npm install && npm cache clean --force
48
 
49
  # Bundle app source
 
 
50
  ADD auto.sh auto.sh
51
  RUN curl -JLO https://github.com/bincooo/SillyTavern-Docker/releases/download/v1.0.0/git-batch
52
  RUN chmod +x auto.sh && chmod +x git-batch
53
 
54
 
55
-
56
  # Copy default chats, characters and user avatars to <folder>.default folder
57
  RUN \
58
  IFS="," RESOURCES="assets,backgrounds,user,context,instruct,QuickReplies,movingUI,themes,characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings" && \
@@ -68,6 +76,8 @@ RUN \
68
  ln -s "../config/settings.json" "public/settings.json" || true && \
69
  mkdir "config" || true && \
70
  mkdir -p "public/user" || true
 
 
71
 
72
  ADD ["user-default.png", "config/User Avatars/user-default.png"]
73
  ADD ["OpenAI Settings", "config/OpenAI Settings"]
@@ -80,6 +90,7 @@ ADD settings.json config/settings.json
80
  # 导入角色卡
81
  ADD characters config/characters
82
 
 
83
  # Cleanup unnecessary files
84
  RUN \
85
  echo "*** Cleanup ***" && \
@@ -94,4 +105,4 @@ RUN chmod -R 777 ${APP_HOME}
94
 
95
  EXPOSE 8000
96
 
97
- CMD [ "./docker-entrypoint.sh" ]
 
13
  WORKDIR ${APP_HOME}
14
  RUN mkdir -p /app/config/
15
  RUN mkdir -p /app/public/
16
+ RUN mkdir -p /app/public/user
17
+ RUN mkdir -p /app/config/User Avatars/
18
+ RUN mkdir -p /app/config/User Avatars/
19
+
20
  RUN chmod -R 777 /app/config/
21
  RUN chmod -R 777 /app/public/
22
+ RUN chmod -R 777 /app/public/user
23
+ RUN chmod -R 777 /app/public/$R
24
+ RUN chmod -R 777 /app/public/$R
25
 
26
 
27
  # Env
 
47
  ENV github_project ""
48
 
49
  # Install app dependencies
50
+ # COPY package*.json post-install.js ./
51
+ RUN git clone https://github.com/SillyTavern/SillyTavern.git --branch 1.11.7 .
52
  RUN \
53
  echo "*** Install npm packages ***" && \
54
  npm install && npm cache clean --force
55
 
56
  # Bundle app source
57
+ # COPY . ./
58
+
59
  ADD auto.sh auto.sh
60
  RUN curl -JLO https://github.com/bincooo/SillyTavern-Docker/releases/download/v1.0.0/git-batch
61
  RUN chmod +x auto.sh && chmod +x git-batch
62
 
63
 
 
64
  # Copy default chats, characters and user avatars to <folder>.default folder
65
  RUN \
66
  IFS="," RESOURCES="assets,backgrounds,user,context,instruct,QuickReplies,movingUI,themes,characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings" && \
 
76
  ln -s "../config/settings.json" "public/settings.json" || true && \
77
  mkdir "config" || true && \
78
  mkdir -p "public/user" || true
79
+ #\
80
+ #for R in $RESOURCES; do mkdir "config/$R"; done || true
81
 
82
  ADD ["user-default.png", "config/User Avatars/user-default.png"]
83
  ADD ["OpenAI Settings", "config/OpenAI Settings"]
 
90
  # 导入角色卡
91
  ADD characters config/characters
92
 
93
+
94
  # Cleanup unnecessary files
95
  RUN \
96
  echo "*** Cleanup ***" && \
 
105
 
106
  EXPOSE 8000
107
 
108
+ CMD [ "./docker-entrypoint.sh" ]