fix: include the approved public CA bundle in release images
All checks were successful
Mostovik Backend CI/CD / Tests and lint (push) Successful in 4m22s
Mostovik Backend CI/CD / Build linux/amd64 release images (push) Successful in 2m53s
Mostovik Backend CI/CD / Deploy and verify internal main (push) Has been skipped
Mostovik Backend CI/CD / Deploy dev (push) Successful in 2m55s
All checks were successful
Mostovik Backend CI/CD / Tests and lint (push) Successful in 4m22s
Mostovik Backend CI/CD / Build linux/amd64 release images (push) Successful in 2m53s
Mostovik Backend CI/CD / Deploy and verify internal main (push) Has been skipped
Mostovik Backend CI/CD / Deploy dev (push) Successful in 2m55s
This commit is contained in:
@@ -11,6 +11,7 @@
|
|||||||
**/.env.*
|
**/.env.*
|
||||||
**/secrets
|
**/secrets
|
||||||
**/*.pem
|
**/*.pem
|
||||||
|
!src/apps/parsers/clients/common/eis_russian_trusted_ca.pem
|
||||||
**/*.key
|
**/*.key
|
||||||
__pycache__
|
__pycache__
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|||||||
@@ -167,7 +167,8 @@ WORKDIR /app
|
|||||||
USER root
|
USER root
|
||||||
COPY src/ ./src/
|
COPY src/ ./src/
|
||||||
COPY docker/scripts/ ./docker/scripts/
|
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 \
|
&& chmod +x /app/docker/scripts/*.sh \
|
||||||
&& chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts
|
&& chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts
|
||||||
|
|
||||||
@@ -183,7 +184,8 @@ WORKDIR /app
|
|||||||
USER root
|
USER root
|
||||||
COPY src/ ./src/
|
COPY src/ ./src/
|
||||||
COPY docker/scripts/ ./docker/scripts/
|
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 \
|
&& chmod +x /app/docker/scripts/*.sh \
|
||||||
&& chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts
|
&& chown -R appuser:appgroup logs media private-parser-artifacts staticfiles input src/static docker/scripts
|
||||||
|
|
||||||
|
|||||||
@@ -119,3 +119,7 @@ readiness remains separate from enablement.
|
|||||||
session behind a default-off setting and a dev-only host compose flag after
|
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;
|
explicit user consent — cost if wrong: only SPB gains this extra trust;
|
||||||
MOEX/system/main trust remains unchanged, certificate verification stays on.
|
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.
|
||||||
|
|||||||
@@ -117,3 +117,10 @@ SPB session использует `clients/common/eis_russian_trusted_ca.pem`; в
|
|||||||
host-owned compose dev, с резервной копией, release lock и config --quiet
|
host-owned compose dev, с резервной копией, release lock и config --quiet
|
||||||
проверкой до штатного CI release. Root checkout/StateCorp/main не изменяются.
|
проверкой до штатного 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 после него.
|
||||||
|
|||||||
Reference in New Issue
Block a user