Compare commits

...
Author SHA1 Message Date
Liosha84 e54e140046 Merge pull request 'Dockerfile без Alpine — curl в healthcheck падал на ВМ staging' (#4) from fix/no-alpine-runtime into master
Reviewed-on: #4
2026-11-05 15:34:32 +01:00
Liosha84 fdd6b8a51f Dockerfile без Alpine: на ВМ staging бинарники Alpine 3.24.3 падают (Bus error), curl в healthcheck тоже
α
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 14:36:58 +01:00
Liosha84 f1cf20f439 Merge pull request 'compose для Jambotron: postgres:17 (Debian) вместо -alpine' (#3) from fix/postgres-debian into master
Reviewed-on: #3
2026-11-05 04:07:23 +01:00
Liosha84 5f8a8607a9 compose для Jambotron: postgres:17 (Debian) — Alpine-сборка падает с Bus error на ВМ staging
α
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 04:05:50 +01:00
Liosha84 c8cf5c195f Merge pull request 'Dockerfile: свой пользователь app вместо mail' (#2) from fix/dockerfile-user into master
Reviewed-on: #2
2026-11-05 03:54:37 +01:00
Liosha84andClaude Opus 5.5 3805be7b42 Dockerfile: свой пользователь app (uid 10001) — mail в Alpine уже есть, addgroup падал
α
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 03:53:55 +01:00
Liosha84 f744def6ed Merge pull request 'Безопасность, SMTP, очередь, DKIM, деплой на Jambotron (75.1–75.3)' (#1) from fix/75-security-smtp into master
Reviewed-on: #1
2026-11-05 03:45:06 +01:00
2 changed files with 13 additions and 8 deletions
+9 -6
View File
@@ -1,7 +1,9 @@
# Build context: repository root (docker compose: context ".", dockerfile backend/Dockerfile) # Build context: repository root (docker compose: context ".", dockerfile backend/Dockerfile)
# No Alpine images: on Jambotron staging VMs (kernel 6.18.55-virt) binaries from Alpine 3.24.3
# (musl 1.2.6) die with "Bus error" — java survived, curl in the healthcheck did not (2026-11-05)
# 1. Web client (Angular) — served by the backend from classpath:/static # 1. Web client (Angular) — served by the backend from classpath:/static
FROM node:22-alpine AS web FROM node:22-bookworm-slim AS web
WORKDIR /web WORKDIR /web
COPY frontend/package*.json ./ COPY frontend/package*.json ./
RUN npm install --no-audit --no-fund RUN npm install --no-audit --no-fund
@@ -9,7 +11,7 @@ COPY frontend/ ./
RUN npx ng build --configuration=production RUN npx ng build --configuration=production
# 2. Backend # 2. Backend
FROM eclipse-temurin:21-jdk-alpine AS build FROM eclipse-temurin:21-jdk AS build
WORKDIR /app WORKDIR /app
COPY gradlew settings.gradle ./ COPY gradlew settings.gradle ./
COPY gradle gradle COPY gradle gradle
@@ -19,12 +21,13 @@ COPY --from=web /web/dist/frontend/browser backend/src/main/resources/static
RUN chmod +x gradlew && ./gradlew :backend:bootJar --no-daemon -x test RUN chmod +x gradlew && ./gradlew :backend:bootJar --no-daemon -x test
# 3. Runtime: not root; data in /app/data (volume) # 3. Runtime: not root; data in /app/data (volume)
FROM eclipse-temurin:21-jre-alpine FROM eclipse-temurin:21-jre
RUN apk add --no-cache curl && addgroup -S mail && adduser -S -G mail mail \ # Ubuntu image, curl included; own user: "mail" already exists (uid 8)
&& mkdir -p /app/data/attachments /app/data/dkim-keys && chown -R mail:mail /app/data RUN groupadd -r -g 10001 app && useradd -r -u 10001 -g app -d /app -s /usr/sbin/nologin app \
&& mkdir -p /app/data/attachments /app/data/dkim-keys && chown -R app:app /app/data
WORKDIR /app WORKDIR /app
COPY --from=build /app/backend/build/libs/*.jar app.jar COPY --from=build /app/backend/build/libs/*.jar app.jar
USER mail USER app
ENV MAIL_ATTACHMENTS_DIR=/app/data/attachments DKIM_KEYS_DIR=/app/data/dkim-keys ENV MAIL_ATTACHMENTS_DIR=/app/data/attachments DKIM_KEYS_DIR=/app/data/dkim-keys
EXPOSE 8080 3025 EXPOSE 8080 3025
HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \ HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
+4 -2
View File
@@ -17,13 +17,15 @@ services:
for name in DB_PASSWORD JWT_SECRET; do for name in DB_PASSWORD JWT_SECRET; do
[ -s /secrets/$$name ] || head -c 48 /dev/urandom | base64 | tr -dc 'A-Za-z0-9' > /secrets/$$name [ -s /secrets/$$name ] || head -c 48 /dev/urandom | base64 | tr -dc 'A-Za-z0-9' > /secrets/$$name
done done
# postgres reads it as uid 70, the app as "mail" — readable inside these containers only # postgres reads it as uid 70, the app as uid 10001 — readable inside these containers only
chmod 644 /secrets/DB_PASSWORD /secrets/JWT_SECRET chmod 644 /secrets/DB_PASSWORD /secrets/JWT_SECRET
volumes: volumes:
- secrets:/secrets - secrets:/secrets
db: db:
image: postgres:17-alpine # Debian, not -alpine: on Jambotron staging VMs (Alpine 3.24, kernel 6.18) the Alpine build of postgres
# dies with "Bus error" even on --version; the Debian build works (2026-11-05)
image: postgres:17
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
secrets-init: secrets-init: