Skip to content

ipgallery / devops

Go to a project
Commit bcdebc69 by amir
Options

update to mqtt change

parent bbfefb9c
Inline Side-by-side
Showing with 16 additions and 10 deletions
config/commetoo-cloud/mcx-backend.yml
...@@ -36,9 +36,11 @@ services: ...@@ -36,9 +36,11 @@ services:
-Dtransportation.dsServer.address=ds:50050#\ -Dtransportation.dsServer.address=ds:50050#\
-Dtransportation.server.address=transportation:50035#\ -Dtransportation.server.address=transportation:50035#\
-Dtransportation.mdeServer.address=mde:50040#\ -Dtransportation.mdeServer.address=mde:50040#\
-Dtransportation.mde2Server.address=mde2:50041" -Dtransportation.mde2Server.address=mde2:50041#\
-Dpubsub.host=mqtt#\
-Dpubsub.port=1883"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/transportation:6-ce3e15c image: municipalitybank.com:5050/mcx/transportation:9-c254299
# image: municipalitybank.com:5050/mcx/transportation:4-e7b2bf7 # image: municipalitybank.com:5050/mcx/transportation:4-e7b2bf7
# image: 172.16.1.212:5050/mcx/transportation:29-9207d8 # image: 172.16.1.212:5050/mcx/transportation:29-9207d8
networks: networks:
...@@ -54,12 +56,14 @@ services: ...@@ -54,12 +56,14 @@ services:
-DconfigFile.location=/opt/mcx/config/config.properties#\ -DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\ -DconfigLocation=/opt/mcx/config/#\
-Dredis.host=redis#\ -Dredis.host=redis#\
-Dparking.server.address=parking:50055#\
-Dds.IpAddress=ds:50050#\ -Dds.IpAddress=ds:50050#\
-Dds.ip=ds:50050#\ -Dds.ip=ds:50050#\
-Dmde.IpAddress=mde:50040#\ -Dmde.IpAddress=mde:50040#\
-Ddemo.changeRandomality=9#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000" -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/parking:21-e0e2da image: municipalitybank.com:5050/mcx/parking:6-e184f20
# image: 172.16.1.212:5050/mcx/parking:20-d72ebf # image: 172.16.1.212:5050/mcx/parking:20-d72ebf
# ports: # ports:
# - "8015:8000" # - "8015:8000"
...@@ -73,6 +77,7 @@ services: ...@@ -73,6 +77,7 @@ services:
-DpublicSafety.updateCrosswalkTimeout=300000#\ -DpublicSafety.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#\
-DpublicSafety.server.address=public-safety:50005#\
-Dredis.host=redis#\ -Dredis.host=redis#\
-DpublicSafety.env.checkEventsDaysBack=180#\ -DpublicSafety.env.checkEventsDaysBack=180#\
-DconfigLocation=/opt/mcx/config/#\ -DconfigLocation=/opt/mcx/config/#\
...@@ -82,7 +87,7 @@ services: ...@@ -82,7 +87,7 @@ services:
-DpublicSafety.env.checkEventsEveryPeriod=300#\ -DpublicSafety.env.checkEventsEveryPeriod=300#\
-DpublicSafety.mdeServer.address=mde:50040" -DpublicSafety.mdeServer.address=mde:50040"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/public-safety:34-4aa842 image: municipalitybank.com:5050/mcx/public-safety:18-de0e4df
# image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb # image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb
ports: ports:
- "8100:8000" - "8100:8000"
...@@ -109,8 +114,9 @@ services: ...@@ -109,8 +114,9 @@ services:
-Dcity.reports=san-diego,chicago#\ -Dcity.reports=san-diego,chicago#\
-Dconfig.public.address=commetoo.com#\ -Dconfig.public.address=commetoo.com#\
-Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\ -Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\
-Dpubsub.url=wss://commetoo.com/mqtt#\
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080" -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
image: 172.16.1.212:5050/mcx/ui:30-4f7251 image: municipalitybank.com:5050/mcx/ui:13-a788e7f
ports: ports:
- "8011:8080" - "8011:8080"
- "9443:8443" - "9443:8443"
...@@ -262,7 +268,8 @@ services: ...@@ -262,7 +268,8 @@ services:
DEBUG_apiService: "yes" DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:2-e9c7d03 image: municipalitybank.com:5050/mcx/mde2:4-36b09f9
#image: municipalitybank.com:5050/mcx/mde2:2-e9c7d03
ports: ports:
- "8040:8140" # apiHandler debug port - "8040:8140" # apiHandler debug port
- "8041:8141" # apiService debug port - "8041:8141" # apiService debug port
......
config/commetoo-cloud/mcx-frontend.yml
...@@ -14,7 +14,7 @@ services: ...@@ -14,7 +14,7 @@ services:
UI_SERVER_HOSTPORT: "ui-api:8080" UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic" PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681" SRG_SERVER_HOSTPORT: "srg:7681"
image: municipalitybank.com:5050/mcx/ui-web:control-center-7-0538537b4a84ee2c77aba24926bc36b1a35ebcc9 image: municipalitybank.com:5050/mcx/ui-web/control-center:15-ac1b3bf
#image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef #image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef
volumes: volumes:
- "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety" - "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
...@@ -73,14 +73,13 @@ services: ...@@ -73,14 +73,13 @@ services:
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic" PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_PORT_7681_TCP_ADDR: "srg" SRG_PORT_7681_TCP_ADDR: "srg"
SRG_PORT_7681_TCP_PORT: "7681" SRG_PORT_7681_TCP_PORT: "7681"
# PUBLIC_SAFETY_IC_PORT_50004_TCP_PORT: "50004"
PGID: "911" PGID: "911"
PUID: "911" PUID: "911"
ONLY_SUBDOMAINS: "false" ONLY_SUBDOMAINS: "false"
URL: "commetoo.com" URL: "commetoo.com"
TZ: "Israel" TZ: "Israel"
image: municipalitybank.com:5050/mcx/front-end/develop-new-letsencrypt # image: municipalitybank.com:5050/mcx/front-end/develop-new-letsencrypt
# image: municipalitybank.com:5050/mcx/front-end:6-c78dab image: municipalitybank.com:5050/mcx/front-end:18-c45b301
ports: ports:
- "443:443" - "443:443"
volumes: volumes:
......
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