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

Reviewed-on: #18

.deploy/deploy-dev.yaml

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

.deploy/deploy-prod.yaml

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