added public safety

docker/composers/mcx-poc-front-control-client.yml

@@ -65,8 +65,8 @@ ui-web-control:
   environment:
   environment:
      CAMERA_API: "172.16.1.140:9090"
      CAMERA_API: "172.16.1.140:9090"
   image: 172.16.1.212:5050/mcx/ui-web:control-center-latest
   image: 172.16.1.212:5050/mcx/ui-web:control-center-latest
-  volumes:
-    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
+#  volumes:
+#    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
   privileged: true
   privileged: true
 ### UI-WEB-CLIENT (NGINX + WEB)
 ### UI-WEB-CLIENT (NGINX + WEB)
 ui-web-client:
 ui-web-client:
@@ -74,9 +74,9 @@ ui-web-client:
   links:
   links:
     - ui-api
     - ui-api
     - srg
     - srg
-#  volumes:
+  volumes:
 #    - "/home/gil/temp/log:/var/log/nginx"
 #    - "/home/gil/temp/log:/var/log/nginx"
-#    - "/home/gil/git/ui-web-client/target/app:/usr/share/nginx/html/app"
+    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
 ### SRG + COMM-LOGIC
 ### SRG + COMM-LOGIC
 comm-logic:
 comm-logic:
   environment:
   environment:
@@ -137,6 +137,36 @@ ds:
     - "8012:50050"
     - "8012:50050"
     - "7443:8443"
     - "7443:8443"
     - "8190:8000"
     - "8190:8000"
+## PUBLIC SFAETY
+public-safety:
+  environment:
+    IPG_ENV_PARAMS: "-DdemoMode=true#\
+    -Dtransportation.updateCrosswalkTimeout=300000#\
+    -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
+    -DconfigFile.location=/opt/mcx/config/config.properties#\
+    -DpublicSafety.dsServer.address=172.16.1.97:8012#\
+    -Dds.ip=172.16.1.244:8012#\
+    -DpublicSafety.mdeServer.address=172.16.1.33:50040#\
+    -DtenantsFile=/opt/mcx/config/tenants.json#\
+    -DcrossWalksFile=/opt/mcx/config/ge-crosswalks.json"
+    USE_DEBUG: "yes"
+  image: 172.16.1.212:5050/ipgallery/public-safety
+  ports:
+    - "8300:8000"
+    - "50005:50005"
+###### mde ###################
+#mde:
+#  environment:
+#    IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
+#    -Dredis.host=172.16.1.33"
+#    USE_DEBUG: "yes"
+#  image: 172.16.1.212:5050/mcx/mde
+#  ports:
+#    - "8200:8000"
+#    - "50040:50040"
+#  extra_hosts:
+#    - "parking:172.16.1.33"
+#    - "transportation:172.16.1.33"
 ## FRONT END
 ## FRONT END
 front-end:
 front-end:
   environment:
   environment:
@@ -145,8 +175,8 @@ front-end:
     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"
     PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
     PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
-    TRANSPORTATION_SERVER: "172.16.1.50:50035"
-    PARKING_SERVER: "172.16.1.50:50055"
+    TRANSPORTATION_SERVER: "172.16.1.33:50035"
+    PARKING_SERVER: "172.16.1.33:50055"
     EMAIL: "avi.junowicz@ipgallery.com"
     EMAIL: "avi.junowicz@ipgallery.com"
     URL: "commetoo.com"
     URL: "commetoo.com"
     SUBDOMAINS: "mcz"
     SUBDOMAINS: "mcz"
@@ -159,35 +189,10 @@ front-end:
   links:
   links:
     - ui-api
     - ui-api
     - srg
     - srg
+    - public-safety
     - ui-web-client
     - ui-web-client
     - ui-web-control
     - ui-web-control
   privileged: true  
   privileged: true  
   volumes:
   volumes:
     - "/home/gil/temp/log:/var/log/nginx"
     - "/home/gil/temp/log:/var/log/nginx"
     - "/opt/mcz/config-letsencrypt/:/config:rw"
     - "/opt/mcz/config-letsencrypt/:/config:rw"
-###### mde ###################
-mde:
-  environment:
-    IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
-    -Dredis.host=172.16.1.33"
-    USE_DEBUG: "yes"
-  image: 172.16.1.212:5050/mcx/mde
-  ports:
-    - "8200:8000"
-    - "50040:50040"
-  extra_hosts:
-    - "parking:172.16.1.33"
-    - "transportation:172.16.1.33"
-## Public Safety ####
-public-safety:
-  environment:
-    IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
-    -Dredis.host=172.16.1.33#\
-    -Duse.iot.reporting=false"
-    USE_DEBUG: "yes"
-  image: 172.16.1.212:5050/mcx/public-safety
-  ports:
-    - "50005:50005"
-  volumes:
-    - "/opt/mcx/config/PublicSafety/:/opt/mcx/config/PublicSafety/"
-#  log_driver: fluentd