Merge pull request 'master' (#16) from master into prod

Reviewed-on: #16

.deploy/deploy-dev.yaml

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

.deploy/deploy-prod.yaml

@@ -8,12 +8,10 @@ services:
     networks:
       - common-infra-nginx
       - configurator
-      - postgres
-      - minio
     environment:
-      DB_HOST: "postgres"
+      DB_HOST: "pg.chocomarsh.com"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio"
+      MINIO_HOST: "minio.chocomarsh.com"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
       REDIS_HOST: "redis.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_PROD
@@ -39,13 +37,10 @@ services:
         
   fetch_stats:
     image: mathwave/sprint-repo:platform
-    networks:
-      - postgres
-      - minio
     environment:
-      DB_HOST: "postgres"
+      DB_HOST: "pg.chocomarsh.com"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio"
+      MINIO_HOST: "minio.schocomarsh.com"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
       REDIS_HOST: "redis.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_PROD
@@ -65,13 +60,10 @@ services:
 
   migrate:
     image: mathwave/sprint-repo:platform
-    networks:
-      - postgres
-      - minio
     environment:
-      DB_HOST: "postgres"
+      DB_HOST: "pg.chocomarsh.com"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio"
+      MINIO_HOST: "minio.chocomarsh.com"
       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