Spaces:

sft0farid
/

code

Paused

App Files Files Community

sft0farid commited on Jun 25

Commit

2d80cb2

verified ·

1 Parent(s): 56ffd78

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +75 -74

Dockerfile CHANGED Viewed

@@ -21,16 +21,14 @@ RUN wget -q https://github.com/openziti/zrok/releases/download/v0.4.42/zrok_0.4.
     && chmod +x /usr/local/bin/zrok \
     && rm zrok_0.4.42_linux_amd64.tar.gz
-# 3. Kiro-Go бинарник из builder-стадии
 COPY --from=kiro-builder /kiro-go /usr/local/bin/kiro-go
 RUN chmod +x /usr/local/bin/kiro-go
-# 4. Non-root пользователь (uid=1000 — требование HF Spaces)
 RUN useradd -m -u 1000 user
-# 5. Директории:
-#    /app  — код приложений
-#    /data — конфиги, базы, рантайм (сюда монтить persistent storage на HF)
 RUN mkdir -p \
         /app/aiclient2api \
         /app/bifrost \
@@ -41,75 +39,78 @@ RUN mkdir -p \
         /data/supervisor/run \
     && chown -R user:user /app /data
-# 6. supervisord.conf
-RUN printf '[supervisord]\n\
-nodaemon=true\n\
-logfile=/dev/stdout\n\
-logfile_maxbytes=0\n\
-pidfile=/data/supervisor/run/supervisord.pid\n\
-\n\
-[program:bifrost]\n\
-command=python /app/bifrost/main.py --port 7860 --host 0.0.0.0\n\
-directory=/data/bifrost\n\
-autostart=true\n\
-autorestart=true\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-\n\
-[program:aiclient]\n\
-command=node /app/aiclient2api/src/core/master.js\n\
-environment=PORT=3000\n\
-directory=/app/aiclient2api\n\
-autostart=true\n\
-autorestart=true\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-\n\
-[program:kirogo]\n\
-command=kiro-go\n\
-environment=PORT=8082,ADMIN_PASSWORD=%(ENV_KIRO_ADMIN_PASSWORD)s\n\
-directory=/data/kirogo\n\
-autostart=true\n\
-autorestart=true\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-\n\
-[program:zrok]\n\
-command=/app/start_zrok.sh\n\
-autostart=true\n\
-autorestart=true\n\
-stdout_logfile=/dev/stdout\n\
-stdout_logfile_maxbytes=0\n\
-stderr_logfile=/dev/stderr\n\
-stderr_logfile_maxbytes=0\n\
-' > /data/supervisor/conf.d/supervisord.conf
-# 7. Скрипт zrok — не падает если токен не задан
-RUN printf '#!/bin/bash\n\
-if [ -z "$ZROK_TOKEN" ] || [ -z "$ZROK_SHARE_NAME" ]; then\n\
-    echo "ZROK_TOKEN or ZROK_SHARE_NAME not set, skipping zrok"\n\
-    sleep infinity\n\
-fi\n\
-zrok enable "$ZROK_TOKEN" --headless 2>/dev/null || true\n\
-exec zrok share reserved "$ZROK_SHARE_NAME" --headless\n\
-' > /app/start_zrok.sh && chmod +x /app/start_zrok.sh
-# 8. Entrypoint — симлинк configs + запуск супервизора
-RUN printf '#!/bin/bash\n\
-# AIClient2API пишет конфиги в /app/aiclient2api/configs\n\
-# симлинкаем туда /data/aiclient2api/configs чтобы данные были в /data\n\
-if [ ! -L /app/aiclient2api/configs ]; then\n\
-    rm -rf /app/aiclient2api/configs\n\
-    ln -s /data/aiclient2api/configs /app/aiclient2api/configs\n\
-fi\n\
-exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf\n\
-' > /app/start.sh && chmod +x /app/start.sh
 # 9. Устанавливаем приложения под user
 USER user

     && chmod +x /usr/local/bin/zrok \
     && rm zrok_0.4.42_linux_amd64.tar.gz
+# 3. Kiro-Go бинарник
 COPY --from=kiro-builder /kiro-go /usr/local/bin/kiro-go
 RUN chmod +x /usr/local/bin/kiro-go
+# 4. Non-root пользователь
 RUN useradd -m -u 1000 user
+# 5. Директории
 RUN mkdir -p \
         /app/aiclient2api \
         /app/bifrost \
         /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
+# 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
+# 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
 # 9. Устанавливаем приложения под user
 USER user