Update Dockerfile
Browse files- Dockerfile +9 -13
Dockerfile
CHANGED
|
@@ -97,26 +97,22 @@ 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 |
-
# Создание скрипта запуска zrok с пр
|
| 101 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh && \
|
| 102 |
echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh && \
|
| 103 |
echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh && \
|
| 104 |
echo 'cd "$HOME"' >> /app/start_zrok.sh && \
|
| 105 |
-
echo '# 1.
|
| 106 |
-
echo '
|
| 107 |
-
echo '
|
| 108 |
-
echo '
|
| 109 |
-
echo '#
|
| 110 |
-
echo '
|
| 111 |
-
echo '
|
| 112 |
-
echo ' sleep 3' >> /app/start_zrok.sh && \
|
| 113 |
-
echo 'done' >> /app/start_zrok.sh && \
|
| 114 |
echo 'echo "[zrok] API detected! Starting public share..."' >> /app/start_zrok.sh && \
|
| 115 |
echo 'zrok2 share public http://127.0.0.1:7860' >> /app/start_zrok.sh && \
|
| 116 |
-
echo 'tail -f /dev/null' >> /app/start_zrok.sh && \
|
| 117 |
chmod +x /app/start_zrok.sh
|
| 118 |
-
|
| 119 |
-
|
| 120 |
# 8. Entrypoint
|
| 121 |
RUN echo '#!/bin/bash' > /app/start.sh \
|
| 122 |
&& echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
|
|
|
|
| 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 |
+
# Создание скрипта запуска zrok с принудительной переавторизацией
|
| 101 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh && \
|
| 102 |
echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh && \
|
| 103 |
echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh && \
|
| 104 |
echo 'cd "$HOME"' >> /app/start_zrok.sh && \
|
| 105 |
+
echo '# 1. Очистка старых данных, чтобы избежать 401 Unauthorized' >> /app/start_zrok.sh && \
|
| 106 |
+
echo 'rm -rf .zrok2' >> /app/start_zrok.sh && \
|
| 107 |
+
echo '# 2. Авторизация с токеном' >> /app/start_zrok.sh && \
|
| 108 |
+
echo 'zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh && \
|
| 109 |
+
echo '# 3. Ждем, пока API на 7860 ответит' >> /app/start_zrok.sh && \
|
| 110 |
+
echo 'echo "[zrok] Waiting for API on port 7860..."' >> /app/start_zrok.sh && \
|
| 111 |
+
echo 'until curl -s http://127.0.0.1:7860/ > /dev/null; do sleep 3; done' >> /app/start_zrok.sh && \
|
|
|
|
|
|
|
| 112 |
echo 'echo "[zrok] API detected! Starting public share..."' >> /app/start_zrok.sh && \
|
| 113 |
echo 'zrok2 share public http://127.0.0.1:7860' >> /app/start_zrok.sh && \
|
|
|
|
| 114 |
chmod +x /app/start_zrok.sh
|
| 115 |
+
|
|
|
|
| 116 |
# 8. Entrypoint
|
| 117 |
RUN echo '#!/bin/bash' > /app/start.sh \
|
| 118 |
&& echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
|