Hugging Face's logo

Spaces:
sft0farid
/
code
Paused

App Files Community
sft0farid commited on
Commit
b633f42
·
verified ·
1 Parent(s): 2fd3a10

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +37 -29
Dockerfile CHANGED
@@ -13,18 +13,18 @@ RUN apt-get update && apt-get install -y curl gnupg supervisor \
13
  && apt-get install -y nodejs \
14
  && rm -rf /var/lib/apt/lists/*
15
 
16
- # 2. zrok v2 — latest
17
  RUN ARCH=$(dpkg --print-architecture) \
18
  && case "$ARCH" in \
19
  amd64) GOARCH=amd64 ;; \
20
  arm64) GOARCH=arm64 ;; \
21
  *) echo "Unsupported arch: $ARCH"; exit 1 ;; \
22
  esac \
23
- && VERSION=$(curl -sSf https://api.github.com/repos/openziti/zrok/releases/latest | grep '"tag_name"' | cut -d'"' -f4) \
24
- && curl -sSfL "https://github.com/openziti/zrok/releases/download/${VERSION}/zrok_${VERSION#v}_linux_${GOARCH}.tar.gz" \
25
  | tar -xz -C /tmp \
26
- && install -o root -g root /tmp/zrok2 /usr/local/bin/zrok2 \
27
- && chmod +x /usr/local/bin/zrok2
28
 
29
  # 3. Копируем из готовых образов
30
  COPY --from=newapi-source /new-api /usr/local/bin/new-api
@@ -88,52 +88,60 @@ RUN echo '[supervisord]'
88
  && echo '[program:zrok]' >> /data/supervisor/conf.d/supervisord.conf \
89
  && echo 'command=/app/start_zrok.sh' >> /data/supervisor/conf.d/supervisord.conf \
90
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
91
- && echo 'autorestart=true' >> /data/supervisor/conf.d/supervisord.conf \
92
- && echo 'startsecs=15' >> /data/supervisor/conf.d/supervisord.conf \
93
- && echo 'startretries=10' >> /data/supervisor/conf.d/supervisord.conf \
94
  && echo 'stdout_logfile=/dev/stdout' >> /data/supervisor/conf.d/supervisord.conf \
95
  && echo 'stdout_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf \
96
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
97
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
98
 
 
99
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
100
- && echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
101
- && echo ' echo "[zrok] ZROK2_TOKEN not set, skipping"' >> /app/start_zrok.sh \
102
  && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
103
  && echo 'fi' >> /app/start_zrok.sh \
104
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
105
- && echo 'export ZROK2_API_ENDPOINT=https://api-v2.zrok.io' >> /app/start_zrok.sh \
106
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
107
  && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
108
  && echo 'sleep 20' >> /app/start_zrok.sh \
109
- && echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
110
- && echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
111
- && echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
112
- && echo ' if [ $? -ne 0 ]; then echo "[zrok] enable failed"; sleep infinity; fi' >> /app/start_zrok.sh \
 
 
 
 
113
  && echo 'else' >> /app/start_zrok.sh \
114
  && echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
115
  && echo 'fi' >> /app/start_zrok.sh \
116
- && echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
117
- && echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
118
- && echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
 
 
119
  && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
120
  && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
121
- && echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
122
  && echo 'else' >> /app/start_zrok.sh \
123
- && echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
124
- && echo ' zrok2 create name -n public "$SHARE_NAME"' >> /app/start_zrok.sh \
 
 
 
 
 
 
125
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
126
- && echo ' echo "[zrok] Reserved name created: $SHARE_NAME"' >> /app/start_zrok.sh \
127
  && echo 'fi' >> /app/start_zrok.sh \
128
- && echo 'echo "[zrok] URL: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
129
- && echo 'RETRY=0' >> /app/start_zrok.sh \
130
  && echo 'while true; do' >> /app/start_zrok.sh \
131
- && echo ' echo "[zrok] Starting share attempt $((RETRY+1))..."' >> /app/start_zrok.sh \
132
- && echo ' zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
133
- && echo ' EXIT=$?' >> /app/start_zrok.sh \
134
- && echo ' echo "[zrok] Share exited with code $EXIT, retrying in 30s..."' >> /app/start_zrok.sh \
135
  && echo ' sleep 30' >> /app/start_zrok.sh \
136
- && echo ' RETRY=$((RETRY+1))' >> /app/start_zrok.sh \
137
  && echo 'done' >> /app/start_zrok.sh \
138
  && chmod +x /app/start_zrok.sh
139
 
 
13
  && apt-get install -y nodejs \
14
  && rm -rf /var/lib/apt/lists/*
15
 
16
+ # 2. zrok v1 — latest
17
  RUN ARCH=$(dpkg --print-architecture) \
18
  && case "$ARCH" in \
19
  amd64) GOARCH=amd64 ;; \
20
  arm64) GOARCH=arm64 ;; \
21
  *) echo "Unsupported arch: $ARCH"; exit 1 ;; \
22
  esac \
23
+ && VERSION=$(curl -sSf https://api.github.com/repos/openziti/zrok/releases | grep '"tag_name"' | grep -v 'v2\|rc\|beta\|alpha' | head -1 | cut -d'"' -f4 | tr -d v) \
24
+ && curl -sSfL "https://github.com/openziti/zrok/releases/download/v${VERSION}/zrok_${VERSION}_linux_${GOARCH}.tar.gz" \
25
  | tar -xz -C /tmp \
26
+ && install -o root -g root /tmp/zrok /usr/local/bin/zrok \
27
+ && chmod +x /usr/local/bin/zrok
28
 
29
  # 3. Копируем из готовых образов
30
  COPY --from=newapi-source /new-api /usr/local/bin/new-api
 
88
  && echo '[program:zrok]' >> /data/supervisor/conf.d/supervisord.conf \
89
  && echo 'command=/app/start_zrok.sh' >> /data/supervisor/conf.d/supervisord.conf \
90
  && echo 'autostart=true' >> /data/supervisor/conf.d/supervisord.conf \
91
+ && echo 'autorestart=false' >> /data/supervisor/conf.d/supervisord.conf \
 
 
92
  && echo 'stdout_logfile=/dev/stdout' >> /data/supervisor/conf.d/supervisord.conf \
93
  && echo 'stdout_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf \
94
  && echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
95
  && echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
96
 
97
+ # 7. Скрипт zrok v1 — retry loop встроен в скрипт
98
  RUN echo '#!/bin/bash' > /app/start_zrok.sh \
99
+ && echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
100
+ && echo ' echo "[zrok] ZROK_TOKEN not set, skipping"' >> /app/start_zrok.sh \
101
  && echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
102
  && echo 'fi' >> /app/start_zrok.sh \
103
  && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
 
104
  && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
105
  && echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
106
  && echo 'sleep 20' >> /app/start_zrok.sh \
107
+ && echo '# Enable только при первом старте' >> /app/start_zrok.sh \
108
+ && echo 'if [ ! -f "$HOME/.zrok/environment.json" ]; then' >> /app/start_zrok.sh \
109
+ && echo ' echo "[zrok] Enabling zrok environment..."' >> /app/start_zrok.sh \
110
+ && echo ' zrok enable "$ZROK_TOKEN" --headless' >> /app/start_zrok.sh \
111
+ && echo ' if [ $? -ne 0 ]; then' >> /app/start_zrok.sh \
112
+ && echo ' echo "[zrok] enable failed, sleeping forever"' >> /app/start_zrok.sh \
113
+ && echo ' sleep infinity' >> /app/start_zrok.sh \
114
+ && echo ' fi' >> /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 \
118
+ && echo '# Определяем имя reserved share' >> /app/start_zrok.sh \
119
+ && echo 'if [ -n "$ZROK_SHARE_TOKEN" ]; then' >> /app/start_zrok.sh \
120
+ && echo ' SHARE_NAME="$ZROK_SHARE_TOKEN"' >> /app/start_zrok.sh \
121
+ && echo ' echo "[zrok] Using share token from env: $SHARE_NAME"' >> /app/start_zrok.sh \
122
+ && echo ' zrok reserve public http://localhost:7860 --unique-name "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
123
  && echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
124
  && echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
125
+ && echo ' echo "[zrok] Using saved share token: $SHARE_NAME"' >> /app/start_zrok.sh \
126
  && echo 'else' >> /app/start_zrok.sh \
127
+ && echo ' echo "[zrok] Creating new reserved share..."' >> /app/start_zrok.sh \
128
+ && echo ' RESERVE_OUT=$(zrok reserve public http://localhost:7860 2>&1)' >> /app/start_zrok.sh \
129
+ && echo ' echo "$RESERVE_OUT"' >> /app/start_zrok.sh \
130
+ && echo ' SHARE_NAME=$(echo "$RESERVE_OUT" | grep -oE "your reserved share token is '"'"'[a-z0-9]+'"'"'" | grep -oE "[a-z0-9]+$")' >> /app/start_zrok.sh \
131
+ && echo ' if [ -z "$SHARE_NAME" ]; then' >> /app/start_zrok.sh \
132
+ && echo ' echo "[zrok] Failed to parse share token, sleeping forever"' >> /app/start_zrok.sh \
133
+ && echo ' sleep infinity' >> /app/start_zrok.sh \
134
+ && echo ' fi' >> /app/start_zrok.sh \
135
  && echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
136
+ && echo ' echo "[zrok] Reserved share created: $SHARE_NAME"' >> /app/start_zrok.sh \
137
  && echo 'fi' >> /app/start_zrok.sh \
138
+ && echo 'echo "[zrok] URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
139
+ && echo '# Retry loop — устойчив к перезапускам' >> /app/start_zrok.sh \
140
  && echo 'while true; do' >> /app/start_zrok.sh \
141
+ && echo ' echo "[zrok] Starting share reserved: $SHARE_NAME"' >> /app/start_zrok.sh \
142
+ && echo ' zrok share reserved "$SHARE_NAME" --headless' >> /app/start_zrok.sh \
143
+ && echo ' echo "[zrok] Share exited, retrying in 30s..."' >> /app/start_zrok.sh \
 
144
  && echo ' sleep 30' >> /app/start_zrok.sh \
 
145
  && echo 'done' >> /app/start_zrok.sh \
146
  && chmod +x /app/start_zrok.sh
147