Update Dockerfile
Browse files- Dockerfile +13 -24
Dockerfile
CHANGED
|
@@ -35,7 +35,7 @@ RUN chmod +x /usr/local/bin/new-api /usr/local/bin/kiro-go
|
|
| 35 |
# 4. Non-root пользователь
|
| 36 |
RUN useradd -m -u 1000 user
|
| 37 |
|
| 38 |
-
# 5. Директории
|
| 39 |
RUN mkdir -p \
|
| 40 |
/data/kirogo \
|
| 41 |
/data/newapi \
|
|
@@ -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 \
|
|
@@ -105,36 +105,25 @@ RUN echo '#!/bin/bash'
|
|
| 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 '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 'else' >> /app/start_zrok.sh \
|
| 113 |
-
&& echo ' echo "[zrok] Environment already enabled, skipping"' >> /app/start_zrok.sh \
|
| 114 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 115 |
-
&& echo '
|
| 116 |
-
&& echo '
|
| 117 |
-
&& echo ' echo "[zrok]
|
| 118 |
-
&& echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null ||
|
| 119 |
-
&& echo '
|
| 120 |
-
&& echo '
|
| 121 |
-
&& echo ' echo "[zrok]
|
| 122 |
-
&& echo '
|
| 123 |
-
&& echo '
|
| 124 |
-
&& echo ' SHARE_NAME=$(cat /proc/sys/kernel/random/uuid | tr -d - | head -c 12)' >> /app/start_zrok.sh \
|
| 125 |
-
&& echo ' zrok2 create name -n public "$SHARE_NAME"' >> /app/start_zrok.sh \
|
| 126 |
-
&& echo ' echo "$SHARE_NAME" > "$SHARE_NAME_FILE"' >> /app/start_zrok.sh \
|
| 127 |
-
&& echo ' echo "[zrok] Reserved name created and saved: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 128 |
-
&& echo 'fi' >> /app/start_zrok.sh \
|
| 129 |
-
&& echo 'echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
|
| 130 |
-
&& echo 'exec zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
|
| 131 |
&& chmod +x /app/start_zrok.sh
|
| 132 |
|
| 133 |
-
# 8. Entrypoint
|
| 134 |
RUN echo '#!/bin/bash' > /app/start.sh \
|
| 135 |
&& echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
|
| 136 |
&& chmod +x /app/start.sh
|
| 137 |
|
| 138 |
EXPOSE 7860
|
| 139 |
|
| 140 |
-
CMD ["/app/start.sh"]
|
|
|
|
| 35 |
# 4. Non-root пользователь
|
| 36 |
RUN useradd -m -u 1000 user
|
| 37 |
|
| 38 |
+
# 5. Директории
|
| 39 |
RUN mkdir -p \
|
| 40 |
/data/kirogo \
|
| 41 |
/data/newapi \
|
|
|
|
| 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 \
|
|
|
|
| 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 'if [ ! -f "$HOME/.zrok2/environment.json" ]; then' >> /app/start_zrok.sh \
|
|
|
|
| 109 |
&& echo ' zrok2 enable "$ZROK2_TOKEN" --headless' >> /app/start_zrok.sh \
|
|
|
|
|
|
|
| 110 |
&& echo 'fi' >> /app/start_zrok.sh \
|
| 111 |
+
&& echo 'SHARE_NAME="${ZROK2_SHARE_NAME:-my-api-share}"' >> /app/start_zrok.sh \
|
| 112 |
+
&& echo 'while true; do' >> /app/start_zrok.sh \
|
| 113 |
+
&& echo ' echo "[zrok] Attempting to reserve/reuse name: $SHARE_NAME"' >> /app/start_zrok.sh \
|
| 114 |
+
&& echo ' zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || echo "[zrok] Name likely already exists, proceeding..."' >> /app/start_zrok.sh \
|
| 115 |
+
&& echo ' echo "[zrok] Starting share: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
|
| 116 |
+
&& echo ' zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless' >> /app/start_zrok.sh \
|
| 117 |
+
&& echo ' echo "[zrok] Process exited, retrying in 5 seconds..."' >> /app/start_zrok.sh \
|
| 118 |
+
&& echo ' sleep 5' >> /app/start_zrok.sh \
|
| 119 |
+
&& echo 'done' >> /app/start_zrok.sh \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 120 |
&& chmod +x /app/start_zrok.sh
|
| 121 |
|
| 122 |
+
# 8. Entrypoint
|
| 123 |
RUN echo '#!/bin/bash' > /app/start.sh \
|
| 124 |
&& echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf' >> /app/start.sh \
|
| 125 |
&& chmod +x /app/start.sh
|
| 126 |
|
| 127 |
EXPOSE 7860
|
| 128 |
|
| 129 |
+
CMD ["/app/start.sh"]
|