new public safety + mde

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

@@ -12,7 +12,7 @@ ui-api:
     -DconfigFile.location=/opt/mcx/config#\
     -Dmcz.files.location=/opt/mcz#\
     -Dpush.server.url=172.16.1.97:50000#\
-    -Dcity.reports=chicago#\
+    -Dcity.reports=chicago,san-diego#\
     -Duse.schedular=true#\
     -Dconfig.public.address=commetoo.com:443#\
     -Drcs.send.message.url=http://172.16.1.97:8060/srg/chat/v1/standalone/sendmessage#\
@@ -65,18 +65,28 @@ ui-web-control:
   environment:
      CAMERA_API: "172.16.1.140:9090"
   image: 172.16.1.212:5050/mcx/ui-web:control-center-latest
-#  volumes:
-#    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
-#  privileged: true
+  volumes:
+    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
+    - "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
+  privileged: true
 ### UI-WEB-CLIENT (NGINX + WEB)
 ui-web-client:
   image: 172.16.1.212:5050/mcx/ui-web:client-latest
   links:
     - ui-api
     - srg
-  volumes:
-    - "/home/gil/temp/log:/var/log/nginx"
-    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
+#  volumes:
+#    - "/home/gil/temp/log:/var/log/nginx"
+#    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
+### UI-WEB-DRIVER (NGINX + WEB)
+#ui-web-client:
+#  image: 172.16.1.212:5050/mcx/ui-web:driver-latest
+#  links:
+#    - ui-api
+#    - srg
+#  volumes:
+#    - "/home/gil/temp/log:/var/log/nginx"
+#    - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
 ### SRG + COMM-LOGIC
 comm-logic:
   environment:
@@ -140,49 +150,70 @@ ds:
 ## PUBLIC SFAETY
 public-safety:
   environment:
-    IPG_ENV_PARAMS: "-DdemoMode=true#\
+    IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago#\
     -Dtransportation.updateCrosswalkTimeout=300000#\
     -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
     -DconfigFile.location=/opt/mcx/config/config.properties#\
+    -DconfigLocation=/opt/mcx/config/
     -DpublicSafety.dsServer.address=172.16.1.97:8012#\
     -Dds.ip=172.16.1.244:8012#\
-    -DpublicSafety.mdeServer.address=172.16.1.69:50040#\
-    -DtenantsFile=/opt/mcx/config/tenants.json#\
-    -DcrossWalksFile=/opt/mcx/config/ge-crosswalks.json"
+    -DpublicSafety.mdeServer.address=172.16.1.97:50040"
     USE_DEBUG: "yes"
   image: 172.16.1.212:5050/mcx/public-safety
   ports:
     - "8300:8000"
     - "50005:50005"
+  privileged: true
   volumes:
-    - "/opt/mcx/config/PublicSafety:/opt/mcx/config"
+    - "/opt/mcx/config/repo/public-safety:/opt/mcx/config/repo/public-safety"
+#    - "/opt/mcx/config/PublicSafety:/opt/mcx/config/"
+## Public Safety IC ####
+public-safety-ic:
+  environment:
+    IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago#\
+    -Ddemo.changeRandomality=6#\
+    -Dds.IpAddress=172.16.1.97:8012#\
+    -Dredis.host=172.16.1.97#\
+    -DconfigFile.location=/opt/mcx/config/ICPublicSafety/config.properties
+    -DconfigLocation=/opt/mcx/config/ICPublicSafety/
+    -Duse.iot.reporting=false"
+    USE_DEBUG: "yes"
+  image: 172.16.1.212:5050/mcx/public-safety:ic-latest
+  ports:
+    - "50004:50004"
+  volumes:
+    - "/opt/mcx/config/ICPublicSafety/:/opt/mcx/config/ICPublicSafety/"
 ###### 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"
+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.72"
+    - "transportation:172.16.1.72"
 ## FRONT END
 front-end:
   environment:
-    OTP_SERVER: "172.16.1.69:8081"
-    KIBANA_SERVER: "172.16.1.69:5601"
+    OTP_SERVER: "172.16.1.72:8081"
+    KIBANA_SERVER: "172.16.1.72:5601"
     CAMERA_STREAM: "172.16.1.141:81"
     CAMERA_API: "172.16.1.140:9090"
     PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
-    TRANSPORTATION_SERVER: "172.16.1.69:50035"
-    PARKING_SERVER: "172.16.1.69:50055"
+    TRANSPORTATION_SERVER: "172.16.1.72:50035"
+    PARKING_SERVER: "172.16.1.72:50055"
     EMAIL: "avi.junowicz@ipgallery.com"
-    URL: "commetoo.com"
+    URL: "commetoo.com:8097"
     SUBDOMAINS: "mcz"
     TZ: "Israel"
+#    PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "172.16.1.151"
+#    PUBLIC_SAFETY_IC_PORT_50004_TCP_PORT: "50004"
+#    PUBLIC_SAFETY_PORT_50005_TCP_ADDR: "172.16.1.151"
+#    PUBLIC_SAFETY_PORT_50005_TCP_PORT: "50005"
   image: 172.16.1.212:5050/mcx/front-end
   ports:
     - "8020:80"
@@ -192,8 +223,9 @@ front-end:
     - ui-api
     - srg
     - public-safety
-    - ui-web-client
+    - public-safety-ic
     - ui-web-control
+    - ui-web-client
   privileged: true  
   volumes:
     - "/home/gil/temp/log:/var/log/nginx"