Update Dockerfile
Browse files- Dockerfile +13 -8
Dockerfile
CHANGED
|
@@ -96,40 +96,45 @@ RUN echo '[supervisord]'
|
|
| 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 |
-
# 7. 小泻褉懈锌褌 zrok v2
|
| 100 |
RUN echo '#!/bin/bash' > /app/start_zrok.sh \
|
| 101 |
-
&& echo 'set -e' >> /app/start_zrok.sh \
|
| 102 |
&& echo 'if [ -z "$ZROK2_TOKEN" ]; then' >> /app/start_zrok.sh \
|
| 103 |
&& echo ' echo "[zrok] ZROK2_TOKEN not set, skipping"' >> /app/start_zrok.sh \
|
| 104 |
&& echo ' sleep infinity; exit 0' >> /app/start_zrok.sh \
|
| 105 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 106 |
&& echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
|
|
|
|
| 107 |
&& echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
|
| 108 |
&& echo 'SHARE_NAME_FILE="$HOME/share_name"' >> /app/start_zrok.sh \
|
| 109 |
&& echo 'sleep 20' >> /app/start_zrok.sh \
|
| 110 |
-
&& echo 'zrok2 config set apiEndpoint https://api-v2.zrok.io' >> /app/start_zrok.sh \
|
| 111 |
&& echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
|
| 112 |
&& echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
|
| 113 |
-
&& echo '
|
|
|
|
| 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 "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
|
| 118 |
&& echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
|
| 119 |
-
&& echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 120 |
&& echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || true' >> /app/start_zrok.sh \
|
| 121 |
&& echo 'elif [ -f "$SHARE_NAME_FILE" ]; then' >> /app/start_zrok.sh \
|
| 122 |
&& echo ' SHARE_NAME=$(cat "$SHARE_NAME_FILE")' >> /app/start_zrok.sh \
|
| 123 |
&& echo ' echo "[zrok] Using saved share name: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 124 |
&& echo 'else' >> /app/start_zrok.sh \
|
| 125 |
-
&& echo ' echo "[zrok] Creating new reserved name..."' >> /app/start_zrok.sh \
|
| 126 |
&& echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
|
| 127 |
&& echo ' zrok2 create name -n public "$SHARE_NAME"' >> /app/start_zrok.sh \
|
| 128 |
&& echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
|
| 129 |
&& echo ' echo "[zrok] Reserved name created: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 130 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 131 |
-
&& echo 'echo "[zrok]
|
| 132 |
-
&& echo '
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
&& chmod +x /app/start_zrok.sh
|
| 134 |
|
| 135 |
# 8. Entrypoint
|
|
|
|
| 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_TOKEN="$ZROK2_TOKEN" zrok2 enable --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 |
|
| 140 |
# 8. Entrypoint
|