added env params to SRG.

docker/composers/mcx-poc.yml

@@ -13,11 +13,9 @@ ui-api:
     -Dmcz.files.location=/opt/mcz#\
     -Dmcz.files.location=/opt/mcz#\
     -Dpush.server.url=172.16.1.97:50000#\
     -Dpush.server.url=172.16.1.97:50000#\
     -Duse.schedular=true#\
     -Duse.schedular=true#\
-    -Dconfig.public.address=172.16.1.97:8020#\
+    -Dconfig.public.address=commetoo.com:443#\
     -Drcs.send.message.url=http://172.16.1.97:8060/srg/chat/v1/standalone/sendmessage#\
     -Drcs.send.message.url=http://172.16.1.97:8060/srg/chat/v1/standalone/sendmessage#\
     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
-# env_file:
-#   - ./common-resin.env
   image: 172.16.1.212:5050/mcx/ui
   image: 172.16.1.212:5050/mcx/ui
   ports:
   ports:
     - "8011:8080"
     - "8011:8080"
@@ -26,8 +24,6 @@ ui-api:
   volumes:
   volumes:
     - "/opt/mcz/user_images:/opt/mcz/user_images"
     - "/opt/mcz/user_images:/opt/mcz/user_images"
 #  log_driver: fluentd
 #  log_driver: fluentd
-#  depends_on:
-#      - "ds"
 # example for remote fluentd agent
 # example for remote fluentd agent
 #  log_opt:
 #  log_opt:
 #    fluentd-address: 172.16.1.97:24224
 #    fluentd-address: 172.16.1.97:24224
@@ -48,7 +44,6 @@ data-logic:
   environment:
   environment:
     IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.97:8012#\
     IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.97:8012#\
     -Dredis.host=172.16.1.97"
     -Dredis.host=172.16.1.97"
-#    USE_DEBUG: "yes"
   image: 172.16.1.212:5050/mcx/data-logic
   image: 172.16.1.212:5050/mcx/data-logic
   ports:
   ports:
     - "8110:8000"
     - "8110:8000"
@@ -68,7 +63,7 @@ push-server:
 ui-web:
 ui-web:
   environment:
   environment:
     OTP_SERVER: "172.16.1.29:8081"
     OTP_SERVER: "172.16.1.29:8081"
-    KIBANA_SERVER: "62.90.235.105:8522"
+    KIBANA_SERVER: "172.16.1.108:5601"
     CAMERA_STREAM: "172.16.1.141:81"
     CAMERA_STREAM: "172.16.1.141:81"
     CAMERA_API: "172.16.1.140:9090"
     CAMERA_API: "172.16.1.140:9090"
   image: 172.16.1.212:5050/mcx/ui-web
   image: 172.16.1.212:5050/mcx/ui-web
@@ -79,9 +74,9 @@ ui-web:
   links:
   links:
     - ui-api
     - ui-api
     - srg
     - srg
+#    - public-safety
   volumes:
   volumes:
-    - "/opt/mcz/user_images:/opt/mcz/user_images"
- #   - public-safety
+    - "/home/gil/git/ui-web/target/app:/usr/share/nginx/html/app"
 ### SRG + COMM-LOGIC
 ### SRG + COMM-LOGIC
 comm-logic:
 comm-logic:
   environment:
   environment:
@@ -98,15 +93,17 @@ comm-logic:
   ports:
   ports:
     - "8130:8000"
     - "8130:8000"
     - "50030:50030"
     - "50030:50030"
-#    - "5060/udp:5060/udp"
 #  log_driver: fluentd
 #  log_driver: fluentd
 srg:
 srg:
   environment:
   environment:
     IPSIPStack_HostName: 172.16.1.97
     IPSIPStack_HostName: 172.16.1.97
     IPSIPStack_InternalHostNameComSrv: 0.0.0.0
     IPSIPStack_InternalHostNameComSrv: 0.0.0.0
+    IPSIPStack_NumOfPorts: 1
+    IPSIPStack_Port1Number: 5076
     IPSIPStack_InternalPort1NumberComSrv: 5076
     IPSIPStack_InternalPort1NumberComSrv: 5076
     IPSIPStack_UseWebSocket: Y
     IPSIPStack_UseWebSocket: Y
     IPSIPStack_WebSocketServerPortNumber: 7681
     IPSIPStack_WebSocketServerPortNumber: 7681
+    SessCntrl_RegisterPortNumber: 5076
     SIPC_MyHostName: 172.16.1.97:8080
     SIPC_MyHostName: 172.16.1.97:8080
     SIPC_MCServicesServerHost: http://172.16.1.97:50030/CommLogic/api/
     SIPC_MCServicesServerHost: http://172.16.1.97:50030/CommLogic/api/
 #  extra_hosts:
 #  extra_hosts:
@@ -132,10 +129,10 @@ ds:
     -Dds.orientdb.url=remote:172.16.1.97#\
     -Dds.orientdb.url=remote:172.16.1.97#\
     -Ddao.use.cache=false#\
     -Ddao.use.cache=false#\
     -Ddao.es.activity.url=activityidx/activity#\
     -Ddao.es.activity.url=activityidx/activity#\
-    -Ddao.es.activity.hostport=172.16.1.97:9200#\
-    -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
+    -Ddao.es.activity.hostport=172.16.1.29:9200"
+    USE_DEBUG: "yes"
   image: 172.16.1.212:5050/mcx/ds
   image: 172.16.1.212:5050/mcx/ds
   ports:
   ports:
-    - "8012:8080"
-#    - "9443:8443"
-    - "9180:9080"
+    - "8012:50050"
+    - "7443:8443"
+    - "8190:8000"