sft0farid commited on
Commit
2a7576c
·
verified ·
1 Parent(s): 8ecf17b

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +3 -14
Dockerfile CHANGED
@@ -35,9 +35,8 @@ RUN chmod +x /usr/local/bin/new-api /usr/local/bin/kiro-go
35
  # 4. Non-root пользователь
36
  RUN useradd -m -u 1000 user
37
 
38
- # 5. Директории
39
  RUN mkdir -p \
40
- /data/aiclient2api/configs \
41
  /data/kirogo \
42
  /data/newapi \
43
  /data/zrok-home \
@@ -97,7 +96,7 @@ RUN echo '[supervisord]'
97
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
98
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
99
 
100
- # 7. Скрипт zrok v2 со статичным доменом
101
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
102
  && echo 'set -e' >> /app/start_zrok.sh \
103
  && echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
@@ -107,16 +106,12 @@ RUN echo '#!/bin/bash'
107
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
108
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
109
  && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
110
- && echo '' >> /app/start_zrok.sh \
111
- && echo '# Шаг 1: enable — только при первом старте' >> /app/start_zrok.sh \
112
  && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
113
  && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
114
  && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
115
  && echo 'else' >> /app/start_zrok.sh \
116
  && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
117
  && echo 'fi' >> /app/start_zrok.sh \
118
- && echo '' >> /app/start_zrok.sh \
119
- && echo '# Шаг 2: определяем имя шара' >> /app/start_zrok.sh \
120
  && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
121
  && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
122
  && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
@@ -131,18 +126,12 @@ RUN echo '#!/bin/bash'
131
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
132
  && echo ' echo "[zrok] Reserved name created and saved: $SHARE_NAME"' >> /app/start_zrok.sh \
133
  && echo 'fi' >> /app/start_zrok.sh \
134
- && echo '' >> /app/start_zrok.sh \
135
- && echo '# Шаг 3: запуск шара' >> /app/start_zrok.sh \
136
  && echo 'echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
137
  && echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
138
  && chmod +x /app/start_zrok.sh
139
 
140
- # 8. Entrypoint
141
  RUN echo '#!/bin/bash' > /app/start.sh \
142
- && echo 'if [ ! -L /app/aiclient2api/configs ]; then' >> /app/start.sh \
143
- && echo ' rm -rf /app/aiclient2api/configs' >> /app/start.sh \
144
- && echo ' ln -s /data/aiclient2api/configs /app/aiclient2api/configs' >> /app/start.sh \
145
- && echo 'fi' >> /app/start.sh \
146
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
147
  && chmod +x /app/start.sh
148
 
 
35
  # 4. Non-root пользователь
36
  RUN useradd -m -u 1000 user
37
 
38
+ # 5. Директории — только то что нужно, без трогания configs
39
  RUN mkdir -p \
 
40
  /data/kirogo \
41
  /data/newapi \
42
  /data/zrok-home \
 
96
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
97
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
98
 
99
+ # 7. Скрипт zrok v2
100
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
101
  && echo 'set -e' >> /app/start_zrok.sh \
102
  && echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
 
106
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
107
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
108
  && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
 
 
109
  && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
110
  && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
111
  && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
112
  && echo 'else' >> /app/start_zrok.sh \
113
  && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
114
  && echo 'fi' >> /app/start_zrok.sh \
 
 
115
  && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
116
  && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
117
  && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
 
126
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
127
  && echo ' echo "[zrok] Reserved name created and saved: $SHARE_NAME"' >> /app/start_zrok.sh \
128
  && echo 'fi' >> /app/start_zrok.sh \
 
 
129
  && echo 'echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
130
  && echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
131
  && chmod +x /app/start_zrok.sh
132
 
133
+ # 8. Entrypoint — просто запуск supervisord, никаких rm -rf
134
  RUN echo '#!/bin/bash' > /app/start.sh \
 
 
 
 
135
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
136
  && chmod +x /app/start.sh
137