Docker fix
CI / quality (push) Has been cancelled

This commit is contained in:
karachkov_is
2026-07-28 08:55:44 +03:00
parent c6a70579cc
commit 4e11b333bb
2 changed files with 20 additions and 11 deletions
+19 -5
View File
@@ -1,24 +1,37 @@
# ---- Базовый образ с Bun ----
FROM oven/bun:1 AS base FROM oven/bun:1 AS base
WORKDIR /app WORKDIR /app
# Копируем ВЕСЬ проект (чтобы bun install видел workspace-пакеты) # ---- Установка зависимостей ----
FROM base AS deps FROM base AS deps
COPY . . COPY . .
RUN bun install RUN bun install
# Сборка через Turbo # ---- Исправление tsconfig (если нужно) ----
# Иногда TypeScript не видит локальный пакет @pascal/typescript-config
# Временно заменяем extends на относительный путь
RUN sed -i 's|"extends": "@pascal/typescript-config/react-library.json"|"extends": "../../typescript-config/react-library.json"|g' packages/core/tsconfig.json || true
# Устанавливаем типы Bun (если их нет в package.json)
RUN bun add -d @types/bun || true
# ---- Сборка проекта ----
FROM base AS builder FROM base AS builder
WORKDIR /app WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules COPY --from=deps /app/node_modules ./node_modules
COPY . . COPY . .
# Сборка через Turbo
RUN bun run build RUN bun run build
# Финальный образ # ---- Продакшен образ ----
FROM base AS runner FROM node:20-alpine AS runner
WORKDIR /app WORKDIR /app
ENV NODE_ENV=production ENV NODE_ENV=production
ENV PORT=3002 ENV PORT=3002
# Копируем собранное приложение и необходимые файлы
COPY --from=builder /app/apps/editor/.next /app/apps/editor/.next COPY --from=builder /app/apps/editor/.next /app/apps/editor/.next
COPY --from=builder /app/apps/editor/public /app/apps/editor/public COPY --from=builder /app/apps/editor/public /app/apps/editor/public
COPY --from=builder /app/apps/editor/package.json /app/apps/editor/package.json COPY --from=builder /app/apps/editor/package.json /app/apps/editor/package.json
@@ -26,5 +39,6 @@ COPY --from=builder /app/node_modules /app/node_modules
COPY --from=builder /app/package.json /app/package.json COPY --from=builder /app/package.json /app/package.json
WORKDIR /app/apps/editor WORKDIR /app/apps/editor
EXPOSE 3002 EXPOSE 3002
CMD ["bun", "run", "start"] CMD ["npx", "next", "start"]
+1 -6
View File
@@ -1,5 +1,3 @@
version: '3.8'
services: services:
editor: editor:
build: build:
@@ -11,7 +9,4 @@ services:
- "3002:3002" - "3002:3002"
environment: environment:
- NODE_ENV=production - NODE_ENV=production
- PORT=3002 - PORT=3002
# При необходимости можно подключить переменные окружения из файла
# env_file:
# - .env.local