Update Dockerfile

Dockerfile

@@ -1,10 +1,20 @@
 # syntax=docker/dockerfile:1.4
+
+# Builder 1: Kiro-Go
 FROM golang:1.22-alpine AS kiro-builder
 RUN apk add --no-cache git
 RUN git clone https://github.com/Quorinex/Kiro-Go.git /src \
     && cd /src \
     && go build -o /kiro-go .
 
+# Builder 2: New API
+FROM golang:1.22-alpine AS newapi-builder
+RUN apk add --no-cache git nodejs npm
+RUN git clone https://github.com/QuantumNous/new-api.git /src
+WORKDIR /src
+RUN npm install && npm run build
+RUN go build -o /new-api .
+
 # ─────────────────────────────────────────────
 FROM python:3.11-slim
 
@@ -21,19 +31,15 @@ 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 бинарник
+# 3. Бинарники из builder-стадий
 COPY --from=kiro-builder /kiro-go /usr/local/bin/kiro-go
-RUN chmod +x /usr/local/bin/kiro-go
-
-# 4. New API бинарник
-RUN wget -q https://github.com/QuantumNous/new-api/releases/latest/download/new-api-linux-amd64 \
-    -O /usr/local/bin/new-api \
-    && chmod +x /usr/local/bin/new-api
+COPY --from=newapi-builder /new-api /usr/local/bin/new-api
+RUN chmod +x /usr/local/bin/kiro-go /usr/local/bin/new-api
 
-# 5. Non-root пользователь
+# 4. Non-root пользователь
 RUN useradd -m -u 1000 user
 
-# 6. Директории
+# 5. Директории
 RUN mkdir -p \
         /app/aiclient2api \
         /data/aiclient2api/configs \
@@ -43,7 +49,7 @@ RUN mkdir -p \
         /data/supervisor/run \
     && chown -R user:user /app /data
 
-# 7. supervisord.conf
+# 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 \
@@ -92,30 +98,31 @@ RUN echo '[supervisord]'
  && echo 'stderr_logfile=/dev/stderr'                                                >> /data/supervisor/conf.d/supervisord.conf \
  && echo 'stderr_logfile_maxbytes=0'                                                 >> /data/supervisor/conf.d/supervisord.conf
 
-# 8. Скрипт zrok
-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 \
+# 7. Скрипт zrok
+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 '    exit 0'                                                                         >> /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
 
-# 9. Entrypoint
-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 \
+# 8. Entrypoint
+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
 
-# 10. Устанавливаем приложения под user
+# 9. Устанавливаем приложения под user
 USER user
 WORKDIR /app
 
-# AIClient2API
+# AIClient2API — latest main
 RUN git clone https://github.com/justlovemaki/AIClient2API.git /app/aiclient2api \
     && cd /app/aiclient2api \
     && npm install