Update Dockerfile

Dockerfile

@@ -51,58 +51,65 @@ RUN echo '[supervisord]' > /app/supervisord.conf \
     && echo 'logfile=/tmp/supervisor/supervisord.log' >> /app/supervisord.conf \
     && echo 'logfile_maxbytes=0' >> /app/supervisord.conf \
     && echo 'pidfile=/tmp/supervisor/supervisord.pid' >> /app/supervisord.conf \
-    && echo 'user=user' >> /app/supervisord.conf \
     && echo '' >> /app/supervisord.conf \
     && echo '[program:newapi]' >> /app/supervisord.conf \
     && echo 'command=/usr/local/bin/new-api --port 7860' >> /app/supervisord.conf \
     && echo 'directory=/data/newapi' >> /app/supervisord.conf \
     && echo 'environment=HOME="/data/newapi",TZ="UTC"' >> /app/supervisord.conf \
+    && echo 'user=user' >> /app/supervisord.conf \
+    && echo 'priority=10' >> /app/supervisord.conf \
     && echo 'autostart=true' >> /app/supervisord.conf \
     && echo 'autorestart=true' >> /app/supervisord.conf \
     && echo 'stopasgroup=true' >> /app/supervisord.conf \
     && echo 'killasgroup=true' >> /app/supervisord.conf \
-    && echo 'stdout_logfile=/tmp/supervisor/newapi.out.log' >> /app/supervisord.conf \
-    && echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
-    && echo 'stderr_logfile=/tmp/supervisor/newapi.err.log' >> /app/supervisord.conf \
-    && echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
+    && echo 'stdout_logfile=/dev/stdout' >> /app/supervisord.conf \
+    && echo 'stdout_logfile_maxbytes=0' >> /app/supervisord.conf \
+    && echo 'stderr_logfile=/dev/stderr' >> /app/supervisord.conf \
+    && echo 'stderr_logfile_maxbytes=0' >> /app/supervisord.conf \
     && echo '' >> /app/supervisord.conf \
     && echo '[program:aiclient]' >> /app/supervisord.conf \
     && echo 'command=/usr/bin/node /app/aiclient2api/src/core/master.js' >> /app/supervisord.conf \
     && echo 'environment=PORT=3000' >> /app/supervisord.conf \
     && echo 'directory=/app/aiclient2api' >> /app/supervisord.conf \
+    && echo 'user=user' >> /app/supervisord.conf \
+    && echo 'priority=10' >> /app/supervisord.conf \
     && echo 'autostart=true' >> /app/supervisord.conf \
     && echo 'autorestart=true' >> /app/supervisord.conf \
     && echo 'stopasgroup=true' >> /app/supervisord.conf \
     && echo 'killasgroup=true' >> /app/supervisord.conf \
-    && echo 'stdout_logfile=/tmp/supervisor/aiclient.out.log' >> /app/supervisord.conf \
-    && echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
-    && echo 'stderr_logfile=/tmp/supervisor/aiclient.err.log' >> /app/supervisord.conf \
-    && echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
+    && echo 'stdout_logfile=/dev/stdout' >> /app/supervisord.conf \
+    && echo 'stdout_logfile_maxbytes=0' >> /app/supervisord.conf \
+    && echo 'stderr_logfile=/dev/stderr' >> /app/supervisord.conf \
+    && echo 'stderr_logfile_maxbytes=0' >> /app/supervisord.conf \
     && echo '' >> /app/supervisord.conf \
     && echo '[program:kirogo]' >> /app/supervisord.conf \
     && echo 'command=/usr/local/bin/kiro-go' >> /app/supervisord.conf \
     && echo 'environment=PORT=8080' >> /app/supervisord.conf \
-    && echo 'directory=/app' >> /app/supervisord.conf \
+    && echo 'directory=/data/kirogo' >> /app/supervisord.conf \
+    && echo 'user=user' >> /app/supervisord.conf \
+    && echo 'priority=20' >> /app/supervisord.conf \
     && echo 'autostart=true' >> /app/supervisord.conf \
     && echo 'autorestart=true' >> /app/supervisord.conf \
     && echo 'stopasgroup=true' >> /app/supervisord.conf \
     && echo 'killasgroup=true' >> /app/supervisord.conf \
-    && echo 'stdout_logfile=/tmp/supervisor/kirogo.out.log' >> /app/supervisord.conf \
-    && echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
-    && echo 'stderr_logfile=/tmp/supervisor/kirogo.err.log' >> /app/supervisord.conf \
-    && echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf \
+    && echo 'stdout_logfile=/dev/stdout' >> /app/supervisord.conf \
+    && echo 'stdout_logfile_maxbytes=0' >> /app/supervisord.conf \
+    && echo 'stderr_logfile=/dev/stderr' >> /app/supervisord.conf \
+    && echo 'stderr_logfile_maxbytes=0' >> /app/supervisord.conf \
     && echo '' >> /app/supervisord.conf \
     && echo '[program:zrok]' >> /app/supervisord.conf \
     && echo 'command=/app/start_zrok.sh' >> /app/supervisord.conf \
+    && echo 'user=user' >> /app/supervisord.conf \
+    && echo 'priority=30' >> /app/supervisord.conf \
     && echo 'autostart=true' >> /app/supervisord.conf \
     && echo 'autorestart=false' >> /app/supervisord.conf \
     && echo 'startsecs=2' >> /app/supervisord.conf \
     && echo 'stopasgroup=true' >> /app/supervisord.conf \
     && echo 'killasgroup=true' >> /app/supervisord.conf \
-    && echo 'stdout_logfile=/tmp/supervisor/zrok.out.log' >> /app/supervisord.conf \
-    && echo 'stdout_logfile_maxbytes=10MB' >> /app/supervisord.conf \
-    && echo 'stderr_logfile=/tmp/supervisor/zrok.err.log' >> /app/supervisord.conf \
-    && echo 'stderr_logfile_maxbytes=10MB' >> /app/supervisord.conf
+    && echo 'stdout_logfile=/dev/stdout' >> /app/supervisord.conf \
+    && echo 'stdout_logfile_maxbytes=0' >> /app/supervisord.conf \
+    && echo 'stderr_logfile=/dev/stderr' >> /app/supervisord.conf \
+    && echo 'stderr_logfile_maxbytes=0' >> /app/supervisord.conf
 
 # 7. Zrok startup script
 RUN echo '#!/bin/bash' > /app/start_zrok.sh \
@@ -115,6 +122,7 @@ RUN echo '#!/bin/bash' > /app/start_zrok.sh \
     && echo 'fi' >> /app/start_zrok.sh \
     && echo '' >> /app/start_zrok.sh \
     && echo 'export HOME=/data/zrok-home' >> /app/start_zrok.sh \
+    && echo 'trap '"'"'echo "[zrok] Shutting down..."; zrok2 disable 2>/dev/null || true; exit 0'"'"' SIGTERM SIGINT' >> /app/start_zrok.sh \
     && echo 'mkdir -p "$HOME"' >> /app/start_zrok.sh \
     && echo '' >> /app/start_zrok.sh \
     && echo 'export ZROK2_API_ENDPOINT=https://api-v2.zrok.io' >> /app/start_zrok.sh \
@@ -145,9 +153,16 @@ RUN echo '#!/bin/bash' > /app/start_zrok.sh \
     && echo 'zrok2 create name -n public "$SHARE_NAME" 2>/dev/null || echo "[zrok] Name already reserved."' >> /app/start_zrok.sh \
     && echo '' >> /app/start_zrok.sh \
     && echo 'echo "[zrok] ==========================================="' >> /app/start_zrok.sh \
-    && echo 'echo "[zrok] STATIC URL: https://${SHARE_NAME}.share.zrok.io"' >> /app/start_zrok.sh \
+    && echo 'echo "[zrok] STATIC URL: https://${SHARE_NAME}.shares.zrok.io"' >> /app/start_zrok.sh \
     && echo 'echo "[zrok] ==========================================="' >> /app/start_zrok.sh \
     && echo '' >> /app/start_zrok.sh \
+    && echo 'echo "[zrok] Waiting for New API to be ready..."' >> /app/start_zrok.sh \
+    && echo 'for i in $(seq 1 30); do' >> /app/start_zrok.sh \
+    && echo '    curl -sf http://localhost:7860/api/status > /dev/null 2>&1 && break' >> /app/start_zrok.sh \
+    && echo '    sleep 2' >> /app/start_zrok.sh \
+    && echo 'done' >> /app/start_zrok.sh \
+    && echo 'echo "[zrok] New API is ready, starting tunnel..."' >> /app/start_zrok.sh \
+    && echo '' >> /app/start_zrok.sh \
     && echo 'while true; do' >> /app/start_zrok.sh \
     && echo '    echo "[zrok] Starting share on localhost:7860 ..."' >> /app/start_zrok.sh \
     && echo '    zrok2 share public http://localhost:7860 -n "public:${SHARE_NAME}" --headless || true' >> /app/start_zrok.sh \