Hugging Face's logo

Spaces:
sft0farid
/
code
Paused

App Files Community
sft0farid commited on
Commit
8ecf17b
·
verified ·
1 Parent(s): e89dc21

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +8 -21
Dockerfile CHANGED
@@ -97,30 +97,21 @@ 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
- # Логика:
102
- # - ZROK2_TOKEN обязателен
103
- # - ZROK2_SHARE_NAME опционален — если не задан, имя генерируется и сохраняется в /data/zrok-home/share_name
104
- # - environment.json проверяется — enable пропускается при повторном старте
105
- # - имя создаётся один раз и сохраняется, при повторных стартах переиспользуется
106
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
107
  && echo 'set -e' >> /app/start_zrok.sh \
108
- && echo '' >> /app/start_zrok.sh \
109
  && echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
110
- && echo ' echo "[zrok] ZROK2_TOKEN not set, skipping zrok"' >> /app/start_zrok.sh \
111
- && echo ' sleep infinity' >> /app/start_zrok.sh \
112
- && echo ' exit 0' >> /app/start_zrok.sh \
113
  && echo 'fi' >> /app/start_zrok.sh \
114
- && echo '' >> /app/start_zrok.sh \
115
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
116
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
117
  && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
118
  && echo '' >> /app/start_zrok.sh \
119
- && echo '# Шаг 1: enable — только если ещё не активировано' >> /app/start_zrok.sh \
120
  && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
121
  && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
122
  && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
123
- && echo ' echo "[zrok] Environment enabled successfully"' >> /app/start_zrok.sh \
124
  && echo 'else' >> /app/start_zrok.sh \
125
  && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
126
  && echo 'fi' >> /app/start_zrok.sh \
@@ -129,20 +120,16 @@ RUN echo '#!/bin/bash'
129
  && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
130
  && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
131
  && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
 
132
  && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
133
  && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
134
  && echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
135
  && echo 'else' >> /app/start_zrok.sh \
136
  && echo ' echo "[zrok] Creating new reserved name..."' >> /app/start_zrok.sh \
137
- && echo ' SHARE_NAME=$(zrok2 create name 2>&1 | grep -oE "[a-z0-9]{4,32}" | tail -1)' >> /app/start_zrok.sh \
138
- && echo ' if [ -z "$SHARE_NAME" ]; then' >> /app/start_zrok.sh \
139
- && echo ' echo "[zrok] Failed to create name, falling back to ephemeral share"' >> /app/start_zrok.sh \
140
- && echo ' exec zrok2 share public http://localhost:7860 --headless' >> /app/start_zrok.sh \
141
- && echo ' fi' >> /app/start_zrok.sh \
142
- && echo ' zrok2 modify name -n public "$SHARE_NAME" -r' >> /app/start_zrok.sh \
143
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
144
- && echo ' echo "[zrok] Reserved name created: $SHARE_NAME"' >> /app/start_zrok.sh \
145
- && echo ' echo "[zrok] URL: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
146
  && echo 'fi' >> /app/start_zrok.sh \
147
  && echo '' >> /app/start_zrok.sh \
148
  && echo '# Шаг 3: запуск шара' >> /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 '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 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
110
  && echo '' >> /app/start_zrok.sh \
111
+ && echo '# Шаг 1: enable — только при первом старте' >> /app/start_zrok.sh \
112
  && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
113
  && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
114
  && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
 
115
  && echo 'else' >> /app/start_zrok.sh \
116
  && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
117
  && echo 'fi' >> /app/start_zrok.sh \
 
120
  && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
121
  && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
122
  && echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
123
+ && echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
124
  && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
125
  && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
126
  && echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
127
  && echo 'else' >> /app/start_zrok.sh \
128
  && echo ' echo "[zrok] Creating new reserved name..."' >> /app/start_zrok.sh \
129
+ && echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
130
+ && echo ' zrok2 create name -n public "$SHARE_NAME"' >> /app/start_zrok.sh \
 
 
 
 
131
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
132
+ && echo ' echo "[zrok] Reserved name created and saved: $SHARE_NAME"' >> /app/start_zrok.sh \
 
133
  && echo 'fi' >> /app/start_zrok.sh \
134
  && echo '' >> /app/start_zrok.sh \
135
  && echo '# Шаг 3: запуск шара' >> /app/start_zrok.sh \