Update Dockerfile
Browse files- Dockerfile +3 -5
Dockerfile
CHANGED
|
@@ -13,7 +13,7 @@ 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 v1.1.11
|
| 17 |
RUN ARCH=$(dpkg --print-architecture) \
|
| 18 |
&& case "$ARCH" in \
|
| 19 |
amd64) GOARCH=amd64 ;; \
|
|
@@ -93,17 +93,17 @@ RUN echo '[supervisord]'
|
|
| 93 |
&& echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
|
| 94 |
&& echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
|
| 95 |
|
| 96 |
-
# 7. Скрипт zrok v1
|
| 97 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
| 98 |
&& echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
|
| 99 |
&& echo ' echo "[zrok] ZROK_TOKEN not set, skipping"' >> /app/start_zrok.sh \
|
| 100 |
&& echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
|
| 101 |
&& echo 'fi' >> /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 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
|
| 105 |
&& echo 'sleep 20' >> /app/start_zrok.sh \
|
| 106 |
-
&& echo '# Enable только при первом старте' >> /app/start_zrok.sh \
|
| 107 |
&& echo 'if [ ! -f "$HOME/.zrok/environment.json" ]; then' >> /app/start_zrok.sh \
|
| 108 |
&& echo ' echo "[zrok] Enabling zrok environment..."' >> /app/start_zrok.sh \
|
| 109 |
&& echo ' zrok enable "$ZROK_TOKEN" --headless' >> /app/start_zrok.sh \
|
|
@@ -114,7 +114,6 @@ RUN echo '#!/bin/bash'
|
|
| 114 |
&& echo 'else' >> /app/start_zrok.sh \
|
| 115 |
&& echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
|
| 116 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 117 |
-
&& echo '# Определяем имя reserved share' >> /app/start_zrok.sh \
|
| 118 |
&& echo 'if [ -n "$ZROK_SHARE_TOKEN" ]; then' >> /app/start_zrok.sh \
|
| 119 |
&& echo ' SHARE_NAME="$ZROK_SHARE_TOKEN"' >> /app/start_zrok.sh \
|
| 120 |
&& echo ' echo "[zrok] Using share token from env: $SHARE_NAME"' >> /app/start_zrok.sh \
|
|
@@ -135,7 +134,6 @@ RUN echo '#!/bin/bash'
|
|
| 135 |
&& echo ' echo "[zrok] Reserved share created: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 136 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 137 |
&& echo 'echo "[zrok] URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
|
| 138 |
-
&& echo '# Retry loop — устойчив к перезапускам' >> /app/start_zrok.sh \
|
| 139 |
&& echo 'while true; do' >> /app/start_zrok.sh \
|
| 140 |
&& echo ' echo "[zrok] Starting share reserved: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 141 |
&& echo ' zrok share reserved "$SHARE_NAME" --headless' >> /app/start_zrok.sh \
|
|
|
|
| 13 |
&& apt-get install -y nodejs \
|
| 14 |
&& rm -rf /var/lib/apt/lists/*
|
| 15 |
|
| 16 |
+
# 2. zrok v1.1.11
|
| 17 |
RUN ARCH=$(dpkg --print-architecture) \
|
| 18 |
&& case "$ARCH" in \
|
| 19 |
amd64) GOARCH=amd64 ;; \
|
|
|
|
| 93 |
&& echo 'stderr_logfile=/dev/stderr' >> /data/supervisor/conf.d/supervisord.conf \
|
| 94 |
&& echo 'stderr_logfile_maxbytes=0' >> /data/supervisor/conf.d/supervisord.conf
|
| 95 |
|
| 96 |
+
# 7. Скрипт zrok v1 с retry loop
|
| 97 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
| 98 |
&& echo 'if [ -z "$ZROK_TOKEN" ]; then' >> /app/start_zrok.sh \
|
| 99 |
&& echo ' echo "[zrok] ZROK_TOKEN not set, skipping"' >> /app/start_zrok.sh \
|
| 100 |
&& echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
|
| 101 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 102 |
&& echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
|
| 103 |
+
&& echo 'export ZROK_API_ENDPOINT=https://api.zrok.io' >> /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 'if [ ! -f "$HOME/.zrok/environment.json" ]; then' >> /app/start_zrok.sh \
|
| 108 |
&& echo ' echo "[zrok] Enabling zrok environment..."' >> /app/start_zrok.sh \
|
| 109 |
&& echo ' zrok enable "$ZROK_TOKEN" --headless' >> /app/start_zrok.sh \
|
|
|
|
| 114 |
&& echo 'else' >> /app/start_zrok.sh \
|
| 115 |
&& echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
|
| 116 |
&& echo 'fi' >> /app/start_zrok.sh \
|
|
|
|
| 117 |
&& echo 'if [ -n "$ZROK_SHARE_TOKEN" ]; then' >> /app/start_zrok.sh \
|
| 118 |
&& echo ' SHARE_NAME="$ZROK_SHARE_TOKEN"' >> /app/start_zrok.sh \
|
| 119 |
&& echo ' echo "[zrok] Using share token from env: $SHARE_NAME"' >> /app/start_zrok.sh \
|
|
|
|
| 134 |
&& echo ' echo "[zrok] Reserved share created: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 135 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 136 |
&& echo 'echo "[zrok] URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
|
|
|
|
| 137 |
&& echo 'while true; do' >> /app/start_zrok.sh \
|
| 138 |
&& echo ' echo "[zrok] Starting share reserved: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 139 |
&& echo ' zrok share reserved "$SHARE_NAME" --headless' >> /app/start_zrok.sh \
|