Update Dockerfile

Dockerfile

@@ -1,29 +1,15 @@
 # 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 curl unzip
-# Устанавливаем bun
-RUN curl -fsSL https://bun.sh/install | sh
-ENV PATH="/root/.bun/bin:$PATH"
-RUN git clone https://github.com/QuantumNous/new-api.git /src
-WORKDIR /src/web
-RUN bun install && DISABLE_ESLINT_PLUGIN='true' bun run build
-WORKDIR /src
-RUN go build -ldflags "-s -w" -o /new-api .
+# Источники готовых образов
+FROM calciumion/new-api:latest AS newapi-source
+FROM justlikemaki/aiclient-2-api:latest AS aiclient-source
+FROM ghcr.io/quorinex/kiro-go:latest AS kirogo-source
 
 # ─────────────────────────────────────────────
 FROM python:3.11-slim
 
 # 1. Системные зависимости + Node.js
-RUN apt-get update && apt-get install -y curl gnupg wget git supervisor \
+RUN apt-get update && apt-get install -y curl gnupg wget supervisor \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
@@ -35,17 +21,17 @@ 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. Бинарники из builder-стадий
-COPY --from=kiro-builder /kiro-go /usr/local/bin/kiro-go
-COPY --from=newapi-builder /new-api /usr/local/bin/new-api
-RUN chmod +x /usr/local/bin/kiro-go /usr/local/bin/new-api
+# 3. Копируем из готовых образов
+COPY --from=newapi-source /app/new-api /usr/local/bin/new-api
+COPY --from=kirogo-source /app/kiro-go /usr/local/bin/kiro-go
+COPY --from=aiclient-source /app /app/aiclient2api
+RUN chmod +x /usr/local/bin/new-api /usr/local/bin/kiro-go
 
 # 4. Non-root пользователь
 RUN useradd -m -u 1000 user
 
 # 5. Директории
 RUN mkdir -p \
-        /app/aiclient2api \
         /data/aiclient2api/configs \
         /data/kirogo \
         /data/newapi \
@@ -122,15 +108,6 @@ RUN echo '#!/bin/bash'
  && echo 'exec /usr/bin/supervisord -c /data/supervisor/conf.d/supervisord.conf'            >> /app/start.sh \
  && chmod +x /app/start.sh
 
-# 9. Устанавливаем приложения под user
-USER user
-WORKDIR /app
-
-# AIClient2API — latest main
-RUN git clone https://github.com/justlovemaki/AIClient2API.git /app/aiclient2api \
-    && cd /app/aiclient2api \
-    && npm install
-
 EXPOSE 7860
 
 CMD ["/app/start.sh"]