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

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +7 -12
Dockerfile CHANGED
@@ -97,24 +97,19 @@ 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 \
104
- && echo ' echo "[zrok] ZROK2_TOKEN not set, skipping"' >> /app/start_zrok.sh \
105
- && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
106
- && echo 'fi' >> /app/start_zrok.sh \
107
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
108
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
109
- && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
110
  && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
111
  && echo 'fi' >> /app/start_zrok.sh \
112
- && echo 'SHARE_NAME="${ZROK2_SHARE_NAME:-my-api-share}"' >> /app/start_zrok.sh \
113
  && echo 'while true; do' >> /app/start_zrok.sh \
114
- && echo ' echo "[zrok] Attempting to reserve/reuse name: $SHARE_NAME"' >> /app/start_zrok.sh \
115
- && echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || echo "[zrok] Name likely already exists, proceeding..."' >> /app/start_zrok.sh \
116
- && echo ' echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
117
- && echo ' zrok2 share public http://localhost:8080 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
118
  && echo ' echo "[zrok] Process exited, retrying in 5 seconds..."' >> /app/start_zrok.sh \
119
  && echo ' sleep 5' >> /app/start_zrok.sh \
120
  && echo 'done' >> /app/start_zrok.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
+ # 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 \