diff --git a/.dockerignore b/.dockerignore index 209bbee..171cb95 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,6 +11,7 @@ **/.env.* **/secrets **/*.pem +!src/apps/parsers/clients/common/eis_russian_trusted_ca.pem **/*.key __pycache__ *.pyc diff --git a/docker/Dockerfile b/docker/Dockerfile index 4463f89..1dbadbc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -167,7 +167,8 @@ WORKDIR /app USER root COPY src/ ./src/ COPY docker/scripts/ ./docker/scripts/ -RUN mkdir -p logs media private-parser-artifacts staticfiles input/fns input/fns/processed input/fns/failed src/static \ +RUN test -s /app/src/apps/parsers/clients/common/eis_russian_trusted_ca.pem \ + && mkdir -p logs media private-parser-artifacts staticfiles input/fns input/fns/processed input/fns/failed src/static \ && chmod +x /app/docker/scripts/*.sh \ && chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts @@ -183,7 +184,8 @@ WORKDIR /app USER root COPY src/ ./src/ COPY docker/scripts/ ./docker/scripts/ -RUN mkdir -p logs media private-parser-artifacts staticfiles input/fns input/fns/processed input/fns/failed src/static \ +RUN test -s /app/src/apps/parsers/clients/common/eis_russian_trusted_ca.pem \ + && mkdir -p logs media private-parser-artifacts staticfiles input/fns input/fns/processed input/fns/failed src/static \ && chmod +x /app/docker/scripts/*.sh \ && chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts diff --git a/docs/sources/2026-10-05-implementation-decisions.md b/docs/sources/2026-10-05-implementation-decisions.md index dad445c..e8b05f7 100644 --- a/docs/sources/2026-10-05-implementation-decisions.md +++ b/docs/sources/2026-10-05-implementation-decisions.md @@ -119,3 +119,7 @@ readiness remains separate from enablement. session behind a default-off setting and a dev-only host compose flag after explicit user consent — cost if wrong: only SPB gains this extra trust; MOEX/system/main trust remains unchanged, certificate verification stays on. +- Ruling: whitelist exactly the existing public Russian CA bundle in Docker + context and fail release image builds if it is missing — live image omitted + it under the generic PEM exclusion — cost if wrong: this public bundle is + shipped in web/worker; all other PEM/keys remain excluded. diff --git a/docs/sources/exchanges.md b/docs/sources/exchanges.md index 8957993..5a35ffc 100644 --- a/docs/sources/exchanges.md +++ b/docs/sources/exchanges.md @@ -117,3 +117,10 @@ SPB session использует `clients/common/eis_russian_trusted_ca.pem`; в host-owned compose dev, с резервной копией, release lock и config --quiet проверкой до штатного CI release. Root checkout/StateCorp/main не изменяются. Флаг не включается автоматически при последующем развёртывании в другом контуре. + +Живая проверка также выявила, что общий `.dockerignore` исключал tracked public +CA bundle из release-образов. Добавлено исключение для единственного файла +`src/apps/parsers/clients/common/eis_russian_trusted_ca.pem`; остальные PEM/keys +остаются исключены. Web/Celery image build теперь требует непустой bundle. +Проверено: два публичных certificate блока, private key блоков нет; отдельный +Docker COPY regression был RED до исключения и GREEN после него.