sft0farid commited on
Commit
00ed0ec
·
verified ·
1 Parent(s): dd22c84

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +16 -16
Dockerfile CHANGED
@@ -97,24 +97,24 @@ 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 'PORT=$1' >> /app/start_zrok.sh \
103
- && echo 'SHARE_NAME=$2' >> /app/start_zrok.sh \
104
- && echo 'if [ -z "$ZROK2_TOKEN" ]; then exit 0; fi' >> /app/start_zrok.sh \
105
- && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
106
- && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
107
- && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
108
- && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
109
- && echo 'fi' >> /app/start_zrok.sh \
110
- && echo 'while true; do' >> /app/start_zrok.sh \
111
- && echo ' # Запускаем share напрямую, убрав конфликтующую команду create name' >> /app/start_zrok.sh \
112
- && echo ' zrok2 share public http://localhost:$PORT --name "$SHARE_NAME" --headless' >> /app/start_zrok.sh \
113
- && echo ' echo "[zrok] Process exited, retrying in 5 seconds..."' >> /app/start_zrok.sh \
114
- && echo ' sleep 5' >> /app/start_zrok.sh \
115
- && echo 'done' >> /app/start_zrok.sh \
116
  && chmod +x /app/start_zrok.sh
117
 
 
118
  # 8. Entrypoint
119
  RUN echo '#!/bin/bash' > /app/start.sh \
120
  && 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 'PORT=$1' >> /app/start_zrok.sh \
103
+ && echo 'if [ -z "$ZROK2_TOKEN" ]; then exit 0; fi' >> /app/start_zrok.sh \
104
+ && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
105
+ && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
106
+ && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
107
+ && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
108
+ && echo 'fi' >> /app/start_zrok.sh \
109
+ && echo 'while true; do' >> /app/start_zrok.sh \
110
+ && echo ' # Запуск без --name, так как этот флаг не поддерживается в данной версии zrok2' >> /app/start_zrok.sh \
111
+ && echo ' zrok2 share public http://localhost:$PORT --headless' >> /app/start_zrok.sh \
112
+ && echo ' echo "[zrok] Process exited, retrying in 5 seconds..."' >> /app/start_zrok.sh \
113
+ && echo ' sleep 5' >> /app/start_zrok.sh \
114
+ && echo 'done' >> /app/start_zrok.sh \
 
115
  && chmod +x /app/start_zrok.sh
116
 
117
+
118
  # 8. Entrypoint
119
  RUN echo '#!/bin/bash' > /app/start.sh \
120
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \