Update Dockerfile

Dockerfile

@@ -39,78 +39,72 @@ RUN mkdir -p \
         /data/supervisor/run \
     && chown -R user:user /app /data
 
-# 6. supervisord.conf — через cat heredoc, % не интерпретируется
-RUN cat > /data/supervisor/conf.d/supervisord.conf << 'EOF'
-[supervisord]
-nodaemon=true
-logfile=/dev/stdout
-logfile_maxbytes=0
-pidfile=/data/supervisor/run/supervisord.pid
-
-[program:bifrost]
-command=python /app/bifrost/main.py --port 7860 --host 0.0.0.0
-directory=/data/bifrost
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:aiclient]
-command=node /app/aiclient2api/src/core/master.js
-environment=PORT=3000
-directory=/app/aiclient2api
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:kirogo]
-command=kiro-go
-environment=PORT=8082,ADMIN_PASSWORD=%(ENV_KIRO_ADMIN_PASSWORD)s
-directory=/data/kirogo
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:zrok]
-command=/app/start_zrok.sh
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-EOF
+# 6. supervisord.conf
+RUN echo '[supervisord]'                                                    > /data/supervisor/conf.d/supervisord.conf \
+ && echo 'nodaemon=true'                                                   >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'logfile=/dev/stdout'                                             >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'logfile_maxbytes=0'                                              >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'pidfile=/data/supervisor/run/supervisord.pid'                    >> /data/supervisor/conf.d/supervisord.conf \
+ && echo ''                                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo '[program:bifrost]'                                               >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'command=python /app/bifrost/main.py --port 7860 --host 0.0.0.0' >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'directory=/data/bifrost'                                         >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autostart=true'                                                  >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autorestart=true'                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile=/dev/stdout'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile=/dev/stderr'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo ''                                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo '[program:aiclient]'                                              >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'command=node /app/aiclient2api/src/core/master.js'              >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'environment=PORT=3000'                                           >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'directory=/app/aiclient2api'                                     >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autostart=true'                                                  >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autorestart=true'                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile=/dev/stdout'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile=/dev/stderr'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo ''                                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo '[program:kirogo]'                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'command=kiro-go'                                                 >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'environment=PORT=8082,ADMIN_PASSWORD=%(ENV_KIRO_ADMIN_PASSWORD)s' >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'directory=/data/kirogo'                                          >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autostart=true'                                                  >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autorestart=true'                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile=/dev/stdout'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile=/dev/stderr'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo ''                                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo '[program:zrok]'                                                  >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'command=/app/start_zrok.sh'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autostart=true'                                                  >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'autorestart=true'                                                >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile=/dev/stdout'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stdout_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile=/dev/stderr'                                      >> /data/supervisor/conf.d/supervisord.conf \
+ && echo 'stderr_logfile_maxbytes=0'                                       >> /data/supervisor/conf.d/supervisord.conf
 
 # 7. Скрипт zrok
-RUN cat > /app/start_zrok.sh << 'EOF'
-#!/bin/bash
-if [ -z "$ZROK_TOKEN" ] || [ -z "$ZROK_SHARE_NAME" ]; then
-    echo "ZROK_TOKEN or ZROK_SHARE_NAME not set, skipping zrok"
-    sleep infinity
-fi
-zrok enable "$ZROK_TOKEN" --headless 2>/dev/null || true
-exec zrok share reserved "$ZROK_SHARE_NAME" --headless
-EOF
-RUN chmod +x /app/start_zrok.sh
+RUN echo '#!/bin/bash'                                                          > /app/start_zrok.sh \
+ && echo 'if [ -z "$ZROK_TOKEN" ] || [ -z "$ZROK_SHARE_NAME" ]; then'         >> /app/start_zrok.sh \
+ && echo '    echo "ZROK_TOKEN or ZROK_SHARE_NAME not set, skipping zrok"'     >> /app/start_zrok.sh \
+ && echo '    sleep infinity'                                                   >> /app/start_zrok.sh \
+ && echo 'fi'                                                                   >> /app/start_zrok.sh \
+ && echo 'zrok enable "$ZROK_TOKEN" --headless 2>/dev/null || true'            >> /app/start_zrok.sh \
+ && echo 'exec zrok share reserved "$ZROK_SHARE_NAME" --headless'              >> /app/start_zrok.sh \
+ && chmod +x /app/start_zrok.sh
 
 # 8. Entrypoint
-RUN cat > /app/start.sh << 'EOF'
-#!/bin/bash
-if [ ! -L /app/aiclient2api/configs ]; then
-    rm -rf /app/aiclient2api/configs
-    ln -s /data/aiclient2api/configs /app/aiclient2api/configs
-fi
-exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf
-EOF
-RUN chmod +x /app/start.sh
+RUN echo '#!/bin/bash'                                                                     > /app/start.sh \
+ && echo 'if [ ! -L /app/aiclient2api/configs ]; then'                                   >> /app/start.sh \
+ && echo '    rm -rf /app/aiclient2api/configs'                                           >> /app/start.sh \
+ && echo '    ln -s /data/aiclient2api/configs /app/aiclient2api/configs'                >> /app/start.sh \
+ && echo 'fi'                                                                             >> /app/start.sh \
+ && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf'         >> /app/start.sh \
+ && chmod +x /app/start.sh
 
 # 9. Устанавливаем приложения под user
 USER user