Liosha84andClaude Opus 5.5
514e1fd0c7
Frontend
- Bring spring-angular-ui back under version control with the Angular 22 +
Material UI from demo-monolith; stop committing the built static/ folder
- Serve the UI from nginx, which proxies /api to the backend so the JWT
cookie works on a single origin, and falls back to index.html for routes
Backend
- Add PUT /api/users/{id}/roles (admin only) that keeps at least one admin
and does not let an admin drop their own admin role
- Tighten security: read tutorials publicly, change them only when logged
in, users/roles API for admins only; hide password hashes in JSON
- Remove unused Settings and Test endpoints, DTO mappers, commented code
- Flyway V2 aligns the schema with the entities; Hibernate now runs with
ddl-auto: validate
- JWT lifetime matches the 24h cookie; fix the cookie name typo
- Keep CORS only for calling the API directly (ng serve without proxy)
Docker
- Backend Dockerfile: Gradle build + JRE runtime with layer caching,
non-root user and healthcheck; add .dockerignore
- UI Dockerfile: Node 24 build + nginx with healthcheck
- docker-compose runs its own Postgres, starts services in health order
and always rebuilds images
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
25 lines
911 B
Docker
25 lines
911 B
Docker
# syntax=docker/dockerfile:1
|
||
|
||
# 1. Сборка Angular
|
||
FROM node:24-alpine AS build
|
||
WORKDIR /ui
|
||
|
||
# Сначала только манифесты — слой с зависимостями пересобирается лишь при их изменении.
|
||
# npm install, а не npm ci: сборка не должна падать, если package-lock.json разошёлся с package.json
|
||
COPY package*.json ./
|
||
RUN --mount=type=cache,target=/root/.npm \
|
||
npm install --legacy-peer-deps --no-audit --no-fund
|
||
|
||
COPY . ./
|
||
RUN npx ng build
|
||
|
||
|
||
# 2. Раздача статики через nginx; /api проксируется на бэкенд
|
||
FROM nginx:alpine
|
||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||
COPY --from=build /ui/static/browser /usr/share/nginx/html
|
||
EXPOSE 80
|
||
|
||
HEALTHCHECK --interval=15s --timeout=5s --start-period=10s --retries=5 \
|
||
CMD wget -q --spider http://127.0.0.1/ || exit 1
|