From 4b9591c816c6f26e70e97358551980b8e031115c Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Sun, 15 Nov 2020 19:48:59 +0300
Subject: [PATCH] configure docker compose file

---
 docker-compose.yml         | 39 +++++++++++++++++++++++++-------------
 src/core/constants/urls.js |  7 +++++--
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index dfa1df7..0764c48 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,33 @@
 version: '3.3'
 services:
-  evocalculator:
-    container_name: evocalc
-    build: .
-    #    ports:
-    #      - "3001:3001"
+  calcapp:
+    container_name: calcapp
+    build: ./EvoCalculator
+    ports:
+      - '80:80'
+    depends_on:
+      - calccore
+    restart: always
     networks:
-      - web
-    labels:
-      - 'traefik.enable=true'
-      - 'traefik.backend=evocalc'
-      - 'traefik.docker.network=web'
-      - 'traefik.http.routers.evocalc.rule=Host(`calculator.evoleasing.ru`)'
-      - 'traefik.http.routers.evocalc.entrypoints=web-secure'
-      - 'traefik.http.routers.evocalc.tls.certresolver=le'
+      vpcbr:
+        ipv4_address: 10.5.0.4
+
+  calccore:
+    container_name: calccore
+    build: ./../EvoCalculator.Core
+    ports:
+      - '5000:5000'
+    restart: always
+    networks:
+      vpcbr:
+        ipv4_address: 10.5.0.5
 
 networks:
+  vpcbr:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 10.5.0.0/16
+          gateway: 10.5.0.1
   web:
     external: true
diff --git a/src/core/constants/urls.js b/src/core/constants/urls.js
index a051bd1..60a81a7 100644
--- a/src/core/constants/urls.js
+++ b/src/core/constants/urls.js
@@ -1,5 +1,8 @@
-export const SERVER_PORT = 3001;
+export const SERVER_PORT = 80;
 export const CRM_GRAPHQL_URL = 'http://crmgraphql-dev.evoleasing.ru';
 export const CRM_GRAPHQL_PROXY_URL = '/crmgraphql';
-export const CORE_URL = 'http://localhost:5000';
+export const CORE_URL =
+  process.env.NODE_ENV === 'development'
+    ? 'http://localhost:5000'
+    : 'http://10.5.0.5:5000';
 export const CORE_PROXY_URL = '/core';