Merge pull request 'master' (#18) from master into prod
Reviewed-on: #18
This commit is contained in:
@@ -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
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user