diff --git a/.forgejo/workflows/ci-tradein.yml b/.forgejo/workflows/ci-tradein.yml index e724c832..b1e2eeb6 100644 --- a/.forgejo/workflows/ci-tradein.yml +++ b/.forgejo/workflows/ci-tradein.yml @@ -346,11 +346,11 @@ jobs: - uses: actions/checkout@v4 - name: Set up Node - # Node 20 — major из tradein-mvp/frontend/Dockerfile (node:20-alpine). + # Node 24 — major из tradein-mvp/frontend/Dockerfile (node:24-alpine). # cache: npm включён с #2770 — package-lock.json теперь tracked. uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "24" cache: npm cache-dependency-path: tradein-mvp/frontend/package-lock.json diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 93f3d075..66b80da9 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -388,12 +388,12 @@ jobs: - uses: actions/checkout@v4 - name: Set up Node - # Node 20 — совпадает с major из frontend/Dockerfile (node:20-alpine). + # Node 24 — совпадает с major из frontend/Dockerfile (node:24-alpine). # cache=npm + cache-dependency-path на lockfile → переиспользуем ~/.npm # между прогонами (mirror Dockerfile's `--mount=type=cache,target=/root/.npm`). uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "24" cache: npm cache-dependency-path: frontend/package-lock.json @@ -449,7 +449,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "24" cache: npm cache-dependency-path: frontend/package-lock.json diff --git a/frontend/Dockerfile b/frontend/Dockerfile index b785b002..d68ce94e 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.7 # ---- deps ---- -FROM node:20-alpine AS deps +FROM node:24-alpine AS deps WORKDIR /app COPY package.json package-lock.json ./ # --legacy-peer-deps: Tailwind 4 alpha + React 19 peer-dep mismatches. @@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/root/.npm \ # ---- builder ---- -FROM node:20-alpine AS builder +FROM node:24-alpine AS builder WORKDIR /app ENV NEXT_TELEMETRY_DISABLED=1 # NEXT_PUBLIC_* must be present at `npm run build` — Next.js inlines them into @@ -25,7 +25,7 @@ RUN npm run build # ---- runner ---- -FROM node:20-alpine AS runner +FROM node:24-alpine AS runner WORKDIR /app # Next.js standalone server.js binds to `process.env.HOSTNAME || '0.0.0.0'`. # Docker auto-sets HOSTNAME to the container id, so without this the server binds diff --git a/tradein-mvp/frontend/Dockerfile b/tradein-mvp/frontend/Dockerfile index 5def62b7..6965c12a 100644 --- a/tradein-mvp/frontend/Dockerfile +++ b/tradein-mvp/frontend/Dockerfile @@ -2,7 +2,7 @@ # Без Sentry/Tailwind/Leaflet/echarts — лёгкая версия только для trade-in. # ---- deps ---- -FROM node:20-alpine AS deps +FROM node:24-alpine AS deps WORKDIR /app # Лок ОБЯЗАТЕЛЕН (без `*`): `npm ci` без него падает, и это правильно — # отсутствие лока раньше молча давало `npm install`, т.е. состав зависимостей @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.npm \ # ---- builder ---- -FROM node:20-alpine AS builder +FROM node:24-alpine AS builder WORKDIR /app ENV NEXT_TELEMETRY_DISABLED=1 @@ -59,7 +59,7 @@ RUN npm run build # ---- runner ---- -FROM node:20-alpine AS runner +FROM node:24-alpine AS runner WORKDIR /app # HOSTNAME=0.0.0.0 — Next.js standalone server.js биндится по этому env. # Без него Docker ставит HOSTNAME= и сервер недоступен по