Update Dockerfile
Browse files- Dockerfile +2 -9
Dockerfile
CHANGED
|
@@ -96,7 +96,7 @@ 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 \
|
|
@@ -106,20 +106,14 @@ RUN echo '#!/bin/bash'
|
|
| 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 '' >> /app/start_zrok.sh \
|
| 110 |
-
&& echo '# Ждём пока предыдущий шар освободится на сервере' >> /app/start_zrok.sh \
|
| 111 |
&& echo 'sleep 20' >> /app/start_zrok.sh \
|
| 112 |
-
&& echo 'zrok2 config set apiEndpoint https://api-v2.zrok.io'
|
| 113 |
-
&& echo '' >> /app/start_zrok.sh \
|
| 114 |
-
&& echo '# Enable только если нет environment — НЕ удаляем его при рестарте' >> /app/start_zrok.sh \
|
| 115 |
&& echo 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
|
| 116 |
&& echo ' echo "[zrok] Enabling zrok2 environment..."' >> /app/start_zrok.sh \
|
| 117 |
&& echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
|
| 118 |
&& echo 'else' >> /app/start_zrok.sh \
|
| 119 |
&& echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
|
| 120 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 121 |
-
&& echo '' >> /app/start_zrok.sh \
|
| 122 |
-
&& echo '# Определяем имя шара' >> /app/start_zrok.sh \
|
| 123 |
&& echo 'if [ -n "$ZROK2_SHARE_NAME" ]; then' >> /app/start_zrok.sh \
|
| 124 |
&& echo ' SHARE_NAME="$ZROK2_SHARE_NAME"' >> /app/start_zrok.sh \
|
| 125 |
&& echo ' echo "[zrok] Using share name from env: $SHARE_NAME"' >> /app/start_zrok.sh \
|
|
@@ -134,7 +128,6 @@ RUN echo '#!/bin/bash'
|
|
| 134 |
&& echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
|
| 135 |
&& echo ' echo "[zrok] Reserved name created: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 136 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 137 |
-
&& echo '' >> /app/start_zrok.sh \
|
| 138 |
&& echo 'echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
|
| 139 |
&& echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
|
| 140 |
&& chmod +x /app/start_zrok.sh
|
|
|
|
| 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 \
|
|
|
|
| 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 ' zrok2 enable "$ZROK2_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 "$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 \
|
|
|
|
| 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] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
|
| 132 |
&& echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
|
| 133 |
&& chmod +x /app/start_zrok.sh
|