master #16

Merged
emmatveev merged 2 commits from master into prod 2025-09-14 09:58:53 +03:00
2 changed files with 23 additions and 22 deletions

View File

@@ -9,14 +9,12 @@ services:
- common-infra-nginx-development - common-infra-nginx-development
- configurator-development - configurator-development
environment: environment:
DB_HOST: "pg.develop.sprinthub.ru" DB_HOST: "pg.dev.chocomarsh.com.ru"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.develop.sprinthub.ru" MINIO_HOST: "minio.dev.chocomarsh.com"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.develop.sprinthub.ru" REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV REDIS_PASSWORD: $REDIS_PASSWORD_DEV
RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
@@ -38,14 +36,12 @@ services:
fetch_stats: fetch_stats:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
environment: environment:
DB_HOST: "pg.develop.sprinthub.ru" DB_HOST: "pg.dev.chocomarsh.com.ru"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.develop.sprinthub.ru" MINIO_HOST: "minio.dev.chocomarsh.com"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.develop.sprinthub.ru" REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV REDIS_PASSWORD: $REDIS_PASSWORD_DEV
RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
@@ -61,10 +57,15 @@ services:
migrate: migrate:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
environment: environment:
DB_HOST: "pg.develop.sprinthub.ru" DB_HOST: "pg.dev.chocomarsh.com.ru"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.develop.sprinthub.ru" MINIO_HOST: "minio.dev.chocomarsh.com"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
command: migrate command: migrate
deploy: deploy:
mode: replicated mode: replicated

View File

@@ -9,13 +9,13 @@ services:
- common-infra-nginx - common-infra-nginx
- configurator - configurator
environment: environment:
DB_HOST: "pg.sprinthub.ru" DB_HOST: "pg.chocomarsh.com"
DB_PASSWORD: $DB_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio.sprinthub.ru" MINIO_HOST: "minio.chocomarsh.com"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
REDIS_HOST: "redis.sprinthub.ru" REDIS_HOST: "redis.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_PROD REDIS_PASSWORD: $REDIS_PASSWORD_PROD
RABBITMQ_HOST: "rabbitmq.sprinthub.ru" RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
@@ -38,13 +38,13 @@ services:
fetch_stats: fetch_stats:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
environment: environment:
DB_HOST: "pg.sprinthub.ru" DB_HOST: "pg.chocomarsh.com"
DB_PASSWORD: $DB_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio.sprinthub.ru" MINIO_HOST: "minio.schocomarsh.com"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
REDIS_HOST: "redis.sprinthub.ru" REDIS_HOST: "redis.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_PROD REDIS_PASSWORD: $REDIS_PASSWORD_PROD
RABBITMQ_HOST: "rabbitmq.sprinthub.ru" RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
@@ -61,9 +61,9 @@ services:
migrate: migrate:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
environment: environment:
DB_HOST: "pg.sprinthub.ru" DB_HOST: "pg.chocomarsh.com"
DB_PASSWORD: $DB_PASSWORD_PROD DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio.sprinthub.ru" MINIO_HOST: "minio.chocomarsh.com"
MINIO_SECRET_KEY: $MINIO _SECRET_KEY_PROD MINIO_SECRET_KEY: $MINIO _SECRET_KEY_PROD
command: migrate command: migrate
deploy: deploy: