dockerfix-3-versions-bump
This commit is contained in:
@@ -13,12 +13,14 @@
|
||||
- Исправлено дублирование вызовов кэширования при обработке авторов со статистикой
|
||||
|
||||
### 🚀 Docker Build Optimization
|
||||
- **⚡ Dockerfile improvements**: Кардинально оптимизирован процесс сборки Docker образа
|
||||
- **⚡ Multi-stage Dockerfile**: Кардинально переработан с многоэтапной сборкой для оптимального размера и кэширования
|
||||
- **Builder stage**: Сборка frontend с полными dev зависимостями
|
||||
- **Production stage**: Минимальный runtime образ без dev пакетов
|
||||
- Переупорядочены слои для максимального кэширования: системные пакеты → Python зависимости → Node.js зависимости → код приложения
|
||||
- Убрано дублирование установки пакетов (`uv sync` + `pip install`) - теперь только `uv`
|
||||
- Добавлены комментарии для понимания назначения каждого слоя
|
||||
- Использование `--frozen` флага для uv для ускорения установки
|
||||
- Объединены RUN команды для уменьшения количества слоёв
|
||||
- **🔧 Frontend build fix**: Исправлена ошибка `vite: not found` через multi-stage build
|
||||
- **📁 .dockerignore**: Создан оптимизированный `.dockerignore` файл
|
||||
- Исключены все файлы разработки, тесты, документация, логи
|
||||
- Значительно уменьшен размер контекста сборки
|
||||
|
||||
29
Dockerfile
29
Dockerfile
@@ -1,4 +1,5 @@
|
||||
FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim
|
||||
# 🏗️ Multi-stage build for optimal caching and size
|
||||
FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim as builder
|
||||
|
||||
# 🔧 System dependencies layer (cached unless OS changes)
|
||||
RUN apt-get update && apt-get install -y \
|
||||
@@ -18,6 +19,24 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 📦 Node.js dependencies layer (cached unless package*.json changes)
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci
|
||||
|
||||
# 🏗️ Frontend build (build with all dependencies)
|
||||
COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# 🚀 Production stage
|
||||
FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim
|
||||
|
||||
# 🔧 Runtime dependencies only
|
||||
RUN apt-get update && apt-get install -y \
|
||||
postgresql-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# 🧠 ML models cache setup (cached unless HF environment changes)
|
||||
RUN mkdir -p /app/.cache/huggingface && chmod 755 /app/.cache/huggingface
|
||||
ENV TRANSFORMERS_CACHE=/app/.cache/huggingface
|
||||
@@ -27,16 +46,12 @@ ENV HF_HOME=/app/.cache/huggingface
|
||||
COPY pyproject.toml uv.lock ./
|
||||
RUN uv sync --frozen --no-install-project
|
||||
|
||||
# 📦 Node.js dependencies layer (cached unless package*.json changes)
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci --only=production
|
||||
|
||||
# 🚀 Application code and final setup (rebuilt on any code change)
|
||||
COPY . .
|
||||
RUN uv sync --frozen --no-editable
|
||||
|
||||
# 🏗️ Frontend build (cached unless frontend code changes)
|
||||
RUN npm run build
|
||||
# 📦 Copy built frontend from builder stage
|
||||
COPY --from=builder /app/dist ./dist
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { CodegenConfig } from '@graphql-codegen/cli'
|
||||
const config: CodegenConfig = {
|
||||
overwrite: true,
|
||||
// Используем только core схему для основной генерации
|
||||
schema: 'http://localhost:8000/graphql',
|
||||
schema: 'https://v3.dscrs.site/graphql',
|
||||
documents: ['panel/graphql/queries/**/*.ts', 'panel/**/*.{ts,tsx}', '!panel/graphql/generated/**'],
|
||||
generates: {
|
||||
'./panel/graphql/generated/introspection.json': {
|
||||
|
||||
1664
package-lock.json
generated
1664
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "publy-panel",
|
||||
"version": "0.9.14",
|
||||
"version": "0.9.20",
|
||||
"type": "module",
|
||||
"description": "Publy, a modern platform for collaborative text creation, offers a user-friendly interface for authors, editors, and readers, supporting real-time collaboration and structured feedback.",
|
||||
"scripts": {
|
||||
@@ -13,27 +13,27 @@
|
||||
"codegen": "graphql-codegen --config codegen.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "^2.2.0",
|
||||
"@graphql-codegen/cli": "^5.0.7",
|
||||
"@graphql-codegen/client-preset": "^4.8.3",
|
||||
"@graphql-codegen/introspection": "^4.0.3",
|
||||
"@graphql-codegen/typescript": "^4.1.6",
|
||||
"@graphql-codegen/typescript-operations": "^4.6.1",
|
||||
"@graphql-codegen/typescript-resolvers": "^4.5.1",
|
||||
"@biomejs/biome": "^2.2.3",
|
||||
"@graphql-codegen/cli": "^6.0.0",
|
||||
"@graphql-codegen/client-preset": "^5.0.0",
|
||||
"@graphql-codegen/introspection": "^5.0.0",
|
||||
"@graphql-codegen/typescript": "^5.0.0",
|
||||
"@graphql-codegen/typescript-operations": "^5.0.0",
|
||||
"@graphql-codegen/typescript-resolvers": "^5.0.0",
|
||||
"@solidjs/router": "^0.15.3",
|
||||
"@types/node": "^24.1.0",
|
||||
"@types/node": "^24.3.1",
|
||||
"@types/prismjs": "^1.26.5",
|
||||
"graphql": "^16.11.0",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"lightningcss": "^1.30.1",
|
||||
"prismjs": "^1.30.0",
|
||||
"solid-js": "^1.9.9",
|
||||
"terser": "^5.43.0",
|
||||
"terser": "^5.44.0",
|
||||
"typescript": "^5.9.2",
|
||||
"vite": "^7.1.2",
|
||||
"vite": "^7.1.5",
|
||||
"vite-plugin-solid": "^2.11.7"
|
||||
},
|
||||
"overrides": {
|
||||
"vite": "^7.1.2"
|
||||
"vite": "^7.1.5"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user