Update Dockerfile
Browse files- Dockerfile +9 -8
Dockerfile
CHANGED
|
@@ -98,24 +98,25 @@ RUN echo '[supervisord]'
|
|
| 98 |
&& echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
|
| 99 |
|
| 100 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
| 101 |
-
&& echo 'PORT=$1' >> /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 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
|
| 107 |
-
&& echo ' echo "[zrok] Not enabled, running enable..."' >> /app/start_zrok.sh \
|
| 108 |
&& echo ' zrok2 enable "$ZROK2_TOKEN"' >> /app/start_zrok.sh \
|
| 109 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 110 |
&& echo 'while true; do' >> /app/start_zrok.sh \
|
| 111 |
-
&& echo ' # 2.
|
| 112 |
-
&& echo '
|
| 113 |
-
&& echo '
|
|
|
|
|
|
|
|
|
|
|
|
|
| 114 |
&& echo ' sleep 5' >> /app/start_zrok.sh \
|
| 115 |
&& echo 'done' >> /app/start_zrok.sh \
|
| 116 |
&& chmod +x /app/start_zrok.sh
|
| 117 |
-
|
| 118 |
-
|
| 119 |
# 8. Entrypoint
|
| 120 |
RUN echo '#!/bin/bash' > /app/start.sh \
|
| 121 |
&& echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
|
|
|
|
| 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. Авторизация' >> /app/start_zrok.sh \
|
| 105 |
&& echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
|
|
|
|
| 106 |
&& echo ' zrok2 enable "$ZROK2_TOKEN"' >> /app/start_zrok.sh \
|
| 107 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 108 |
&& echo 'while true; do' >> /app/start_zrok.sh \
|
| 109 |
+
&& echo ' # 2. Ждем, пока сервис на 7860 порту ответит' >> /app/start_zrok.sh \
|
| 110 |
+
&& echo ' until curl -s http://127.0.0.1:7860/ > /dev/null; do' >> /app/start_zrok.sh \
|
| 111 |
+
&& echo ' echo "[zrok] Waiting for API on port 7860..."' >> /app/start_zrok.sh \
|
| 112 |
+
&& echo ' sleep 5' >> /app/start_zrok.sh \
|
| 113 |
+
&& echo ' done' >> /app/start_zrok.sh \
|
| 114 |
+
&& echo ' echo "[zrok] API detected! Starting share..."' >> /app/start_zrok.sh \
|
| 115 |
+
&& echo ' zrok2 share public http://127.0.0.1:7860' >> /app/start_zrok.sh \
|
| 116 |
&& echo ' sleep 5' >> /app/start_zrok.sh \
|
| 117 |
&& echo 'done' >> /app/start_zrok.sh \
|
| 118 |
&& chmod +x /app/start_zrok.sh
|
| 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 \
|