Skip to content

ipgallery / devops

Go to a project
Commit 0e77b093 by Gil Sade
Options

new public safety + mde

parent fc0df69a
Inline Side-by-side
Showing with 62 additions and 30 deletions
docker/composers/mcx-poc-front-control-client.yml
...@@ -12,7 +12,7 @@ ui-api: ...@@ -12,7 +12,7 @@ ui-api:
-DconfigFile.location=/opt/mcx/config#\ -DconfigFile.location=/opt/mcx/config#\
-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#\
-Dcity.reports=chicago#\ -Dcity.reports=chicago,san-diego#\
-Duse.schedular=true#\ -Duse.schedular=true#\
-Dconfig.public.address=commetoo.com:443#\ -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#\
...@@ -65,18 +65,28 @@ ui-web-control: ...@@ -65,18 +65,28 @@ 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: volumes:
# - "/home/gil/git/ui-web/target:/usr/share/nginx/html" - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
# privileged: true - "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
privileged: true
### UI-WEB-CLIENT (NGINX + WEB) ### UI-WEB-CLIENT (NGINX + WEB)
ui-web-client: ui-web-client:
image: 172.16.1.212:5050/mcx/ui-web:client-latest image: 172.16.1.212:5050/mcx/ui-web:client-latest
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/target:/usr/share/nginx/html" # - "/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 ### SRG + COMM-LOGIC
comm-logic: comm-logic:
environment: environment:
...@@ -140,49 +150,70 @@ ds: ...@@ -140,49 +150,70 @@ ds:
## PUBLIC SFAETY ## PUBLIC SFAETY
public-safety: public-safety:
environment: environment:
IPG_ENV_PARAMS: "-DdemoMode=true#\ IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago#\
-Dtransportation.updateCrosswalkTimeout=300000#\ -Dtransportation.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\ -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\ -DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/
-DpublicSafety.dsServer.address=172.16.1.97:8012#\ -DpublicSafety.dsServer.address=172.16.1.97:8012#\
-Dds.ip=172.16.1.244:8012#\ -Dds.ip=172.16.1.244:8012#\
-DpublicSafety.mdeServer.address=172.16.1.69:50040#\ -DpublicSafety.mdeServer.address=172.16.1.97:50040"
-DtenantsFile=/opt/mcx/config/tenants.json#\
-DcrossWalksFile=/opt/mcx/config/ge-crosswalks.json"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/public-safety image: 172.16.1.212:5050/mcx/public-safety
ports: ports:
- "8300:8000" - "8300:8000"
- "50005:50005" - "50005:50005"
privileged: true
volumes: 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 ###################
#mde: mde:
# environment: environment:
# IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\ IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
# -Dredis.host=172.16.1.33" -Dredis.host=172.16.1.33"
# USE_DEBUG: "yes" USE_DEBUG: "yes"
# image: 172.16.1.212:5050/mcx/mde image: 172.16.1.212:5050/mcx/mde
# ports: ports:
# - "8200:8000" - "8200:8000"
# - "50040:50040" - "50040:50040"
# extra_hosts: extra_hosts:
# - "parking:172.16.1.33" - "parking:172.16.1.72"
# - "transportation:172.16.1.33" - "transportation:172.16.1.72"
## FRONT END ## FRONT END
front-end: front-end:
environment: environment:
OTP_SERVER: "172.16.1.69:8081" OTP_SERVER: "172.16.1.72:8081"
KIBANA_SERVER: "172.16.1.69:5601" KIBANA_SERVER: "172.16.1.72: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"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000" PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
TRANSPORTATION_SERVER: "172.16.1.69:50035" TRANSPORTATION_SERVER: "172.16.1.72:50035"
PARKING_SERVER: "172.16.1.69:50055" PARKING_SERVER: "172.16.1.72:50055"
EMAIL: "avi.junowicz@ipgallery.com" EMAIL: "avi.junowicz@ipgallery.com"
URL: "commetoo.com" URL: "commetoo.com:8097"
SUBDOMAINS: "mcz" SUBDOMAINS: "mcz"
TZ: "Israel" 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 image: 172.16.1.212:5050/mcx/front-end
ports: ports:
- "8020:80" - "8020:80"
...@@ -192,8 +223,9 @@ front-end: ...@@ -192,8 +223,9 @@ front-end:
- ui-api - ui-api
- srg - srg
- public-safety - public-safety
- ui-web-client - public-safety-ic
- ui-web-control - ui-web-control
- ui-web-client
privileged: true privileged: true
volumes: volumes:
- "/home/gil/temp/log:/var/log/nginx" - "/home/gil/temp/log:/var/log/nginx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment