Compare commits

...

10 Commits

Author SHA1 Message Date
a327ba1fcb Merge pull request 'master' (#17) from master into dev
Reviewed-on: #17
2025-09-18 23:45:36 +03:00
f8b700b982 Update .deploy/deploy-prod.yaml
All checks were successful
Deploy Dev / Build (pull_request) Successful in 1m12s
Deploy Dev / Push (pull_request) Successful in 28s
Deploy Dev / Deploy dev (pull_request) Successful in 26s
Deploy Prod / Build (pull_request) Successful in 7s
Deploy Prod / Push (pull_request) Successful in 11s
Deploy Prod / Deploy prod (pull_request) Successful in 13s
2025-09-18 23:45:10 +03:00
c96ad735d7 Update .deploy/deploy-dev.yaml 2025-09-18 23:44:00 +03:00
fa1b0c9700 Merge pull request 'fix' (#9) from config into dev
Reviewed-on: #9
2024-11-24 23:32:45 +03:00
7cf29376bd Merge pull request 'fix' (#8) from config into dev
Reviewed-on: #8
2024-11-24 22:50:13 +03:00
a1d0b8e14f Merge pull request 'fix' (#7) from config into dev
Reviewed-on: #7
2024-11-24 12:28:28 +03:00
6c6e8867fd Merge pull request 'fix' (#6) from config into dev
Reviewed-on: #6
2024-11-24 12:25:04 +03:00
fc007cfdcd Merge pull request 'fix' (#5) from config into dev
Reviewed-on: #5
2024-11-24 12:08:40 +03:00
24e0029d10 Merge pull request 'config' (#4) from config into dev
Reviewed-on: #4
2024-11-24 12:07:02 +03:00
e9574ff7a8 Merge pull request 'fix' (#1) from master into dev
Reviewed-on: #1
2024-10-11 16:21:40 +03:00
2 changed files with 36 additions and 12 deletions

View File

@@ -8,10 +8,12 @@ services:
networks: networks:
- common-infra-nginx-development - common-infra-nginx-development
- configurator-development - configurator-development
- postgres-development
- minio-development
environment: environment:
DB_HOST: "pg.dev.chocomarsh.com.ru" DB_HOST: "postgres"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.dev.chocomarsh.com" MINIO_HOST: "minio"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com" REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV REDIS_PASSWORD: $REDIS_PASSWORD_DEV
@@ -35,10 +37,13 @@ services:
fetch_stats: fetch_stats:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
networks:
- postgres-development
- minio-development
environment: environment:
DB_HOST: "pg.dev.chocomarsh.com.ru" DB_HOST: "postgres"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.dev.chocomarsh.com" MINIO_HOST: "minio"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com" REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV REDIS_PASSWORD: $REDIS_PASSWORD_DEV
@@ -56,10 +61,13 @@ services:
migrate: migrate:
image: mathwave/sprint-repo:platform image: mathwave/sprint-repo:platform
networks:
- postgres-development
- minio-development
environment: environment:
DB_HOST: "pg.dev.chocomarsh.com.ru" DB_HOST: "postgres"
DB_PASSWORD: $DB_PASSWORD_DEV DB_PASSWORD: $DB_PASSWORD_DEV
MINIO_HOST: "minio.dev.chocomarsh.com" MINIO_HOST: "minio"
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
REDIS_HOST: "redis.dev.chocomarsh.com" REDIS_HOST: "redis.dev.chocomarsh.com"
REDIS_PASSWORD: $REDIS_PASSWORD_DEV REDIS_PASSWORD: $REDIS_PASSWORD_DEV
@@ -80,3 +88,7 @@ networks:
external: true external: true
configurator-development: configurator-development:
external: true external: true
postgres-development:
external: true
minio-development:
external: true

View File

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