Hugging Face's logo

Spaces:
sft0farid
/
code
Paused

App Files Community
sft0farid commited on
Commit
484794c
·
verified ·
1 Parent(s): 6ec6884

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +43 -15
Dockerfile CHANGED
@@ -1,4 +1,3 @@
1
-
2
  # syntax=docker/dockerfile:1.4
3
 
4
  FROM calciumion/new-api:latest AS newapi-source
@@ -90,25 +89,54 @@ RUN echo '[supervisord]'
90
  && echo 'command=/app/start_zrok.sh' >> /data/supervisor/conf.d/supervisord.conf \
91
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
92
  && echo 'autorestart=true' >> /data/supervisor/conf.d/supervisord.conf \
93
- && echo 'startsecs=5' >> /data/supervisor/conf.d/supervisord.conf \
94
- && echo 'startretries=3' >> /data/supervisor/conf.d/supervisord.conf \
95
  && echo 'stdout_logfile=/dev/stdout' >> /data/supervisor/conf.d/supervisord.conf \
96
  && echo 'stdout_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf \
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
- RUN echo '#!/bin/bash' > /app/start_zrok.sh && \
101
- echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh && \
102
- echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh && \
103
- echo 'cd "$HOME"' >> /app/start_zrok.sh && \
104
- echo '# 1. Удаляем всё старое, чтобы исключить кешированные 401 ошибки' >> /app/start_zrok.sh && \
105
- echo 'rm -rf .zrok2' >> /app/start_zrok.sh && \
106
- echo 'zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh && \
107
- echo '# 2. Ждем API приложения' >> /app/start_zrok.sh && \
108
- echo 'until curl -s http://127.0.0.1:7860/ > /dev/null; do sleep 2; done' >> /app/start_zrok.sh && \
109
- echo '# 3. Пробуем запустить шару' >> /app/start_zrok.sh && \
110
- echo 'zrok2 share public http://127.0.0.1:7860' >> /app/start_zrok.sh && \
111
- chmod +x /app/start_zrok.sh
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
112
 
113
  # 8. Entrypoint
114
  RUN echo '#!/bin/bash' > /app/start.sh \
 
 
1
  # syntax=docker/dockerfile:1.4
2
 
3
  FROM calciumion/new-api:latest AS newapi-source
 
89
  && echo 'command=/app/start_zrok.sh' >> /data/supervisor/conf.d/supervisord.conf \
90
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
91
  && echo 'autorestart=true' >> /data/supervisor/conf.d/supervisord.conf \
92
+ && echo 'startsecs=15' >> /data/supervisor/conf.d/supervisord.conf \
93
+ && echo 'startretries=10' >> /data/supervisor/conf.d/supervisord.conf \
94
  && echo 'stdout_logfile=/dev/stdout' >> /data/supervisor/conf.d/supervisord.conf \
95
  && echo 'stdout_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf \
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 — стабильный адрес, без rm -rf
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 \
103
+ && echo ' echo "[zrok] ZROK2_TOKEN not set, skipping"' >> /app/start_zrok.sh \
104
+ && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
105
+ && echo 'fi' >> /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 '' >> /app/start_zrok.sh \
110
+ && echo '# Ждём пока предыдущий шар освободится на сервере' >> /app/start_zrok.sh \
111
+ && echo 'sleep 20' >> /app/start_zrok.sh \
112
+ && echo '' >> /app/start_zrok.sh \
113
+ && echo '# Enable только если нет environment — НЕ удаляем его при рестарте' >> /app/start_zrok.sh \
114
+ && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
115
+ && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
116
+ && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
117
+ && echo 'else' >> /app/start_zrok.sh \
118
+ && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
119
+ && echo 'fi' >> /app/start_zrok.sh \
120
+ && echo '' >> /app/start_zrok.sh \
121
+ && echo '# Определяем имя шара' >> /app/start_zrok.sh \
122
+ && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
123
+ && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
124
+ && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
125
+ && echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
126
+ && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
127
+ && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
128
+ && echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
129
+ && echo 'else' >> /app/start_zrok.sh \
130
+ && echo ' echo "[zrok] Creating new reserved name..."' >> /app/start_zrok.sh \
131
+ && echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
132
+ && echo ' zrok2 create name -n public "$SHARE_NAME"' >> /app/start_zrok.sh \
133
+ && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
134
+ && echo ' echo "[zrok] Reserved name created: $SHARE_NAME"' >> /app/start_zrok.sh \
135
+ && echo 'fi' >> /app/start_zrok.sh \
136
+ && echo '' >> /app/start_zrok.sh \
137
+ && echo 'echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
138
+ && echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
139
+ && chmod +x /app/start_zrok.sh
140
 
141
  # 8. Entrypoint
142
  RUN echo '#!/bin/bash' > /app/start.sh \