self/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: self:master
Branches Tags
self:master self:prod self:dev
..
compare: self:4bffbaa71c244c8b5509a09e2c973905c385de6e
Branches Tags
self:prod self:dev self:master

7 Commits
master ... 4bffbaa71c

Author SHA1 Message Date
emmatveev
4bffbaa71c Merge pull request 'fix' (#15) from master into prod 
Reviewed-on: #15
 2024-12-08 15:50:42 +03:00
emmatveev
d756179afc Merge pull request 'master' (#14) from master into prod 
Reviewed-on: #14
 2024-12-08 15:17:34 +03:00
emmatveev
eec0828dda Merge pull request 'Update stats/management/commands/fetch_stats.py' (#13) from master into prod 
Reviewed-on: #13
 2024-12-02 15:13:51 +03:00
emmatveev
2a30408bf0 Merge pull request 'master' (#12) from master into prod 
Reviewed-on: #12
 2024-11-27 02:27:20 +03:00
emmatveev
5275687b26 Merge pull request 'config' (#10) from config into prod 
Reviewed-on: #10
 2024-11-24 23:40:06 +03:00
emmatveev
ff45d77f44 Merge pull request 'Update .deploy/deploy-prod.yaml' (#3) from master into prod 
Reviewed-on: #3
 2024-10-11 16:29:00 +03:00
emmatveev
0948519267 Merge pull request 'fix' (#2) from master into prod 
Reviewed-on: #2
 2024-10-11 16:25:12 +03:00
2 changed files with 22 additions and 47 deletions
Expand all files Collapse all files

37
.deploy/deploy-dev.yaml
View File

@@ -8,15 +8,15 @@ services:
networks:
- common-infra-nginx-development
- configurator-development
- postgres-development
- minio-development
environment:
DB_HOST: "postgres"
DB_HOST: "pg.develop.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio"
MINIO_HOST: "minio.develop.sprinthub.ru"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_HOST: "redis.develop.sprinthub.ru"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV
RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
@@ -37,16 +37,15 @@ services:
fetch_stats:
image: mathwave/sprint-repo:platform
networks:
- postgres-development
- minio-development
environment:
DB_HOST: "postgres"
DB_HOST: "pg.develop.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio"
MINIO_HOST: "minio.develop.sprinthub.ru"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_HOST: "redis.develop.sprinthub.ru"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV
RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
@@ -61,19 +60,11 @@ services:
migrate:
image: mathwave/sprint-repo:platform
networks:
- postgres-development
- minio-development
environment:
DB_HOST: "postgres"
DB_HOST: "pg.develop.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio"
MINIO_HOST: "minio.develop.sprinthub.ru"
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
deploy:
mode: replicated
@@ -88,7 +79,3 @@ networks:
external: true
configurator-development:
external: true
postgres-development:
external: true
minio-development:
external: true

32
.deploy/deploy-prod.yaml
View File

@@ -8,16 +8,14 @@ services:
networks:
- common-infra-nginx
- configurator
- postgres
- minio
environment:
DB_HOST: "postgres"
DB_HOST: "pg.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio"
MINIO_HOST: "minio.sprinthub.ru"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
REDIS_HOST: "redis.chocomarsh.com"
REDIS_HOST: "redis.sprinthub.ru"
REDIS_PASSWORD: $REDIS_PASSWORD_PROD
RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
RABBITMQ_HOST: "rabbitmq.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
@@ -39,17 +37,14 @@ services:
fetch_stats:
image: mathwave/sprint-repo:platform
networks:
- postgres
- minio
environment:
DB_HOST: "postgres"
DB_HOST: "pg.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio"
MINIO_HOST: "minio.sprinthub.ru"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
REDIS_HOST: "redis.chocomarsh.com"
REDIS_HOST: "redis.sprinthub.ru"
REDIS_PASSWORD: $REDIS_PASSWORD_PROD
RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
RABBITMQ_HOST: "rabbitmq.sprinthub.ru"
RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
@@ -65,13 +60,10 @@ services:
migrate:
image: mathwave/sprint-repo:platform
networks:
- postgres
- minio
environment:
DB_HOST: "postgres"
DB_HOST: "pg.sprinthub.ru"
DB_PASSWORD: $DB_PASSWORD_PROD
MINIO_HOST: "minio"
MINIO_HOST: "minio.sprinthub.ru"
MINIO_SECRET_KEY: $MINIO _SECRET_KEY_PROD
command: migrate
deploy:
@@ -87,7 +79,3 @@ networks:
external: true
configurator:
external: true
postgres:
external: true
minio:
external: true