Skip to content

ipgallery / devops

Go to a project
Commit 925937b1 by Amir Aharon
Options

update config and accounts

parent 463af0a1
Expand all
Inline Side-by-side
Showing with 256 additions and 76 deletions
common/docs/Accounts.odt
No preview for this file type
common/docs/Java A Beginner's Guide Sixth Edition[A4].pdf deleted 100644 → 0
The file could not be displayed because it is too large.
common/docs/UsefulCommands.txt
...@@ -36,4 +36,7 @@ pass: g@ll3r&15 ...@@ -36,4 +36,7 @@ pass: g@ll3r&15
- rancher app key in digitalocean: - rancher app key in digitalocean:
2eea41fb3801935540ba6ec42a1105360c1c1a4daa8306d7eee53dacdfd300bc 2eea41fb3801935540ba6ec42a1105360c1c1a4daa8306d7eee53dacdfd300bc
[bash]
replacing files names/extensions:
for f in *; do mv "$f" "`echo $f | sed s/Vehicle/Vehicle.jpg/`"; done
config/commetoo-cloud/lets-encrypt.yml 0 → 100644
version: '2'
services:
front-end:
environment:
PGID: "911"
PUID: "911"
ONLY_SUBDOMAINS: "false"
URL: "commetoo.com"
TZ: "America/New_York"
MAKE_CERT: "true"
image: linuxserver/letsencrypt
ports:
- "443:443"
volumes:
- "/opt/mcz/config-letsencrypt/:/config:rw"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
\ No newline at end of file
config/commetoo-cloud/mcx-external.yml
...@@ -9,7 +9,8 @@ services: ...@@ -9,7 +9,8 @@ services:
- "/ext/mongodb/:/data/db" - "/ext/mongodb/:/data/db"
networks: networks:
- backend - backend
# command: mongod --replSet Server_29 command: mongod --smallfiles
# command: mongod --nojournal
##### Redis ##### Redis
redis: redis:
image: redis image: redis
...@@ -38,19 +39,18 @@ services: ...@@ -38,19 +39,18 @@ services:
networks: networks:
- backend - backend
###Open Trip Planner ###Open Trip Planner
otp: # otp:
# image: opentripplanner/opentripplanner # image: municipalitybank.com:5050/mcx/devops/otp
image: municipalitybank.com:5050/mcx/devops/otp # ports:
ports: # - "8082:8080"
- "8082:8080" # - "8083:8081"
- "8083:8081" # volumes:
volumes: # - /var/otp/graphs:/var/otp/graphs
- /var/otp/graphs:/var/otp/graphs # environment:
environment: # JAVA_ARGS: "-Xms256m -Xmx512m"
JAVA_ARGS: "-Xms256m -Xmx512m" # command: --autoScan --server
command: --autoScan --server # networks:
networks: # - backend
- backend
mqtt: mqtt:
image: eclipse-mosquitto image: eclipse-mosquitto
ports: ports:
...@@ -63,6 +63,7 @@ services: ...@@ -63,6 +63,7 @@ services:
networks: networks:
- backend - backend
elk: elk:
# image: sebp/elk:612
image: sebp/elk image: sebp/elk
ports: ports:
- "5601:5601" - "5601:5601"
...@@ -90,6 +91,49 @@ services: ...@@ -90,6 +91,49 @@ services:
#curl -XPUT "http://localhost:9200/activityidx" -d'{ "mappings": { "activity": { "properties": { "metaData.loc": { "type": "geo_point" } } } } }' #curl -XPUT "http://localhost:9200/activityidx" -d'{ "mappings": { "activity": { "properties": { "metaData.loc": { "type": "geo_point" } } } } }'
# view # view
# curl: curl -XGET "http://localhost:9200/activityidx/activity" -d'{ "query": { "match_all": {} }}' # curl: curl -XGET "http://localhost:9200/activityidx/activity" -d'{ "query": { "match_all": {} }}'
influxdb:
environment:
INFLUXDB_GRAPHITE_ENABLED: 'true'
INFLUXDB_DB: "mcx_db"
INFLUXDB_USER: "root"
INFLUXDB_USER_PASSWORD: "giptmgr"
image: influxdb
ports:
- "8084:8083"
- "8086:8086"
- "2003:2003"
volumes:
- /ext/influxdb:/var/lib/influxdb
- /tmp/influxdb:/tmp
networks:
- backend
grafana:
environment:
GF_INSTALL_PLUGINS: "grafana-piechart-panel,briangann-gauge-panel"
GF_AUTH_ANONYMOUS_ENABLED: 'true'
# GF_AUTH_ANONYMOUS_ORG_NAME: 'Main Org'
GF_AUTH_ANONYMOUS_ORG_ROLE: 'Anonymous'
GF_SERVER_DOMAIN: 'ipgallery-mcz.com'
GF_SERVER_ROOT_URL: '%(protocol)s://%(domain)s:/grafana'
HTTP_USER: "root"
HTTP_PASS: "giptmgrr"
INFLUXDB_PROTO: http
INFLUXDB_HOST: influxdb
INFLUXDB_PORT: 8086
INFLUXDB_NAME: "mcx_db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "giptmgrr"
image: grafana/grafana
ports:
- "3000:3000"
- "8048:80"
depends_on:
- influxdb
volumes:
- /ext/grafana:/var/lib/grafana
#user/pass = admin/admin
networks:
- backend
networks: networks:
backend: backend:
driver: bridge driver: bridge
config/commetoo-cloud/mcx-frontend.yml
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
### UI-WEB-CONTROL (NGINX + WEB) ### UI-WEB-CONTROL (NGINX + WEB)
ui-web-control: ui-web-control:
environment: environment:
OTP_SERVER: "otp:8081" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081" CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090" CAMERA_API: "62.90.201.74:9090"
...@@ -14,8 +14,16 @@ services: ...@@ -14,8 +14,16 @@ 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:15-ac1b3bf image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
#image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef #image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:13-4f061a9
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:11-685384e
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:9-5b70c6a
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:8-e5ef395
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:7-0a04ab2
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:6-97035d7
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:5-cd322bb
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:4-891383a
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"
networks: networks:
...@@ -26,7 +34,7 @@ services: ...@@ -26,7 +34,7 @@ services:
#image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965 #image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965
# image: 172.16.1.212:5050/mcx/ui-web:client-25-fc74e8fe1b9cf7fbca90ad3b4da9fc3187bf4d1e # image: 172.16.1.212:5050/mcx/ui-web:client-25-fc74e8fe1b9cf7fbca90ad3b4da9fc3187bf4d1e
environment: environment:
OTP_SERVER: "otp:8081" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081" CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090" CAMERA_API: "62.90.201.74:9090"
...@@ -44,7 +52,7 @@ services: ...@@ -44,7 +52,7 @@ services:
# image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01 # image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01
image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
environment: environment:
OTP_SERVER: "otp:8081" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081" CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090" CAMERA_API: "62.90.201.74:9090"
...@@ -60,7 +68,7 @@ services: ...@@ -60,7 +68,7 @@ services:
## FRONT END ## FRONT END
front-end: front-end:
environment: environment:
OTP_SERVER: "otp:8081" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081" CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090" CAMERA_API: "62.90.201.74:9090"
...@@ -76,16 +84,25 @@ services: ...@@ -76,16 +84,25 @@ services:
PGID: "911" PGID: "911"
PUID: "911" PUID: "911"
ONLY_SUBDOMAINS: "false" ONLY_SUBDOMAINS: "false"
URL: "commetoo.com" URL: "safeyme.com"
TZ: "Israel" TZ: "Israel"
MAKE_CERT: "true" MAKE_CERT: "true"
# image: municipalitybank.com:5050/mcx/front-end/develop-new-letsencrypt VALIDATION: "http"
image: municipalitybank.com:5050/mcx/front-end:18-c45b301 # DNSPLUGIN: "digitalocean"
# image: linuxserver/letsencrypt
image: municipalitybank.com:5050/mcx/front-end:23-aea4c68
# image: municipalitybank.com:5050/mcx/front-end:22-aea4c68
# image: municipalitybank.com:5050/mcx/front-end:21-9c64e69
# image: municipalitybank.com:5050/mcx/front-end:20-c0d5a5d
# image: municipalitybank.com:5050/mcx/front-end:19-d2f0bbb
ports: ports:
- "443:443" - "443:443"
- "80:80"
volumes: volumes:
- "/opt/mcz/config-letsencrypt/:/config:rw" - "/opt/mcz/config-letsencrypt/:/config:rw"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw" - "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
# extra_hosts:
# - "grafana:172.16.1.244"
networks: networks:
- backend - backend
networks: networks:
......
config/commetoo-cloud/ws-event-simulator.yml 0 → 100644
version: '2'
services:
ws-event-simulator:
environment:
file: "/tmp/events.json"
delay: 10
image: municipalitybank.com:5050/mcx/devops/ws-event-simulator
ports:
- "8053:8053"
volumes:
- "/opt/mcx/config/ws-event-simulator/events.json:/tmp/events.json"
networks:
- backend
networks:
backend:
driver: bridge
config/integration/mcx-backend.yml
...@@ -89,9 +89,9 @@ services: ...@@ -89,9 +89,9 @@ services:
## PUBLIC SFAETY ## PUBLIC SFAETY
public-safety: public-safety:
environment: environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\ IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim#\
-DpublicSafety.updateCrosswalkTimeout=300000#\ -DpublicSafety.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\ -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\ -DconfigFile.location=/opt/mcx/config/config.properties#\
-DpublicSafety.server.address=public-safety:50005#\ -DpublicSafety.server.address=public-safety:50005#\
-Dredis.host=redis#\ -Dredis.host=redis#\
...@@ -232,7 +232,8 @@ services: ...@@ -232,7 +232,8 @@ services:
-DconfigLocation=/opt/mcx/config/ICPublicSafety/ -DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false" -Duse.iot.reporting=false"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2 image: municipalitybank.com:5050/mcx/public-safety/ic:29-9857b49
# image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
# image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616 # image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab # image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
ports: ports:
...@@ -288,12 +289,14 @@ services: ...@@ -288,12 +289,14 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\ ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\ -DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060#\ -Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://172.16.1.72:8053/events" -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
# -Dwebsocket_url=ws://172.16.1.72:8053/events"
DEBUG_httpAdapter: "yes" DEBUG_httpAdapter: "yes"
ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\ ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
-DconfigLocation=/opt/mcx/config/apiService/#\ -DconfigLocation=/opt/mcx/config/apiService/#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dredis.host=redis#\ -Dredis.host=redis#\
-DloginUserName=ipgallery#\ -DloginUserName=ipgallery#\
-DloginPassword=1PGall3ry#\ -DloginPassword=1PGall3ry#\
......
config/integration/mcx-frontend.yml
...@@ -14,7 +14,9 @@ services: ...@@ -14,7 +14,9 @@ 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-v2:15-c1f1193 image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:16-f910a61
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:14-1740888 #image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:14-1740888
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:12-f0a0cee #image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:12-f0a0cee
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:11-158b6c1 #image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:11-158b6c1
......
config/integration/ws-event-simulator.yml 0 → 100644
version: '2'
services:
ws-event-simulator:
environment:
file: "/tmp/events.json"
delay: 10
image: municipalitybank.com:5050/mcx/devops/ws-event-simulator
ports:
- "8053:8053"
volumes:
- "/opt/mcx/config/ws-event-simulator/events.json:/tmp/events.json"
config/ipgallery-mcz/mcx-backend.yml
...@@ -16,7 +16,8 @@ services: ...@@ -16,7 +16,8 @@ services:
# -Dds.sap.hana.url=35.156.55.64:8000#\ # -Dds.sap.hana.url=35.156.55.64:8000#\
# -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\ # -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/ds:37-43b2b94 image: municipalitybank.com:5050/mcx/ds:39-7a42bd7
#image: municipalitybank.com:5050/mcx/ds:37-43b2b94
# image: 172.16.1.212:5050/mcx/ds:21-837052 # image: 172.16.1.212:5050/mcx/ds:21-837052
ports: ports:
- "8012:50050" - "8012:50050"
...@@ -27,7 +28,7 @@ services: ...@@ -27,7 +28,7 @@ services:
###### transportation ################### ###### transportation ###################
transportation: transportation:
environment: environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim#\ IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim,san-jose#\
-Ddemo.changeRandomality=6#\ -Ddemo.changeRandomality=6#\
-DconfigFile.location=/opt/mcx/config/config.properties#\ -DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\ -DconfigLocation=/opt/mcx/config/#\
...@@ -44,7 +45,8 @@ services: ...@@ -44,7 +45,8 @@ services:
-Dpubsub.host=mqtt#\ -Dpubsub.host=mqtt#\
-Dpubsub.port=1883" -Dpubsub.port=1883"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/transportation:17-ec4f801 image: municipalitybank.com:5050/mcx/transportation:18-2da1950
# image: municipalitybank.com:5050/mcx/transportation:17-ec4f801
# image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08 # image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08
# image: municipalitybank.com:5050/mcx/transportation:15-0efa750 # image: municipalitybank.com:5050/mcx/transportation:15-0efa750
# image: municipalitybank.com:5050/mcx/transportation:12-b1b7268 # image: municipalitybank.com:5050/mcx/transportation:12-b1b7268
...@@ -57,7 +59,7 @@ services: ...@@ -57,7 +59,7 @@ services:
####### parking ################### ####### parking ###################
parking: parking:
environment: environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim#\ IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim,busan,san-jose#\
-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#\
...@@ -68,7 +70,8 @@ services: ...@@ -68,7 +70,8 @@ services:
-Ddemo.changeRandomality=9#\ -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: municipalitybank.com:5050/mcx/parking:9-6cec946 image: municipalitybank.com:5050/mcx/parking:16-c3069b2
# image: municipalitybank.com:5050/mcx/parking:9-6cec946
# image: municipalitybank.com:5050/mcx/parking:7-a8c7fc9 # image: municipalitybank.com:5050/mcx/parking:7-a8c7fc9
# image: municipalitybank.com:5050/mcx/parking:6-e184f20 # 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
...@@ -80,7 +83,7 @@ services: ...@@ -80,7 +83,7 @@ services:
## PUBLIC SFAETY ## PUBLIC SFAETY
public-safety: public-safety:
environment: environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\ IPG_ENV_PARAMS: "-DdemoMode=pedestrian@san-diego,minneapolis,modiin,chicago,givatayim,san-jose#\
-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#\
...@@ -96,7 +99,9 @@ services: ...@@ -96,7 +99,9 @@ services:
-DpublicSafety.mdeServer.address=mde:50040#\ -DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.mde2Server.address=mde2:50041" -DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1 image: municipalitybank.com:5050/mcx/public-safety:35-bb9469d
# image: municipalitybank.com:5050/mcx/public-safety:23-2f0a378
# image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1
# image: municipalitybank.com:5050/mcx/public-safety:21-c14ead7 # image: municipalitybank.com:5050/mcx/public-safety:21-c14ead7
# image: municipalitybank.com:5050/mcx/public-safety:19-3b62940 # image: municipalitybank.com:5050/mcx/public-safety:19-3b62940
# image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb # image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb
...@@ -216,7 +221,8 @@ services: ...@@ -216,7 +221,8 @@ services:
-DconfigLocation=/opt/mcx/config/ICPublicSafety/ -DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false" -Duse.iot.reporting=false"
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2 image: municipalitybank.com:5050/mcx/public-safety/ic:29-9857b49
# image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
# image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616 # image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab # image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
ports: ports:
...@@ -262,7 +268,7 @@ services: ...@@ -262,7 +268,7 @@ services:
mde2: mde2:
environment: environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\ ENV_PARAMS_COMMON: "-Dredis.host=redis#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000" -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\ ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler" -DconfigLocation=/opt/mcx/config/apiHandler"
...@@ -271,7 +277,8 @@ services: ...@@ -271,7 +277,8 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\ ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\ -DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060" -Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://172.16.1.33:8053/events"
DEBUG_httpAdapter: "yes" DEBUG_httpAdapter: "yes"
...@@ -285,7 +292,8 @@ services: ...@@ -285,7 +292,8 @@ services:
-Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\ -Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\
-Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1" -Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes" DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:8-50c28c6 image: municipalitybank.com:5050/mcx/mde2:18-7fd3ca4
#image: municipalitybank.com:5050/mcx/mde2:8-50c28c6
#image: municipalitybank.com:5050/mcx/mde2:7-2188c62 #image: municipalitybank.com:5050/mcx/mde2:7-2188c62
#image: municipalitybank.com:5050/mcx/mde2:6-1b865d2 #image: municipalitybank.com:5050/mcx/mde2:6-1b865d2
#image: municipalitybank.com:5050/mcx/mde2:5-ea91ef5 #image: municipalitybank.com:5050/mcx/mde2:5-ea91ef5
...@@ -306,8 +314,9 @@ services: ...@@ -306,8 +314,9 @@ services:
mqtt: "mqtt:1883" mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086" influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db" influxdb_dbname: "mcx_db"
callbackAddress: "ipgallery-mcz.com/predictions" callbackAddress: "https://ipgallery-mcz.com/predictions"
image: municipalitybank.com:5050/mcx/predictions providerUrl: "http://localhost:5000/forecast"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125
ports: ports:
- "50065:50065" - "50065:50065"
networks: networks:
......
config/ipgallery-mcz/mcx-external.yml
...@@ -9,7 +9,8 @@ services: ...@@ -9,7 +9,8 @@ services:
- "/ext/mongodb/:/data/db" - "/ext/mongodb/:/data/db"
networks: networks:
- backend - backend
# command: mongod --replSet Server_29 command: mongod --smallfiles
# command: mongod --nojournal
##### Redis ##### Redis
redis: redis:
image: redis image: redis
...@@ -70,6 +71,7 @@ services: ...@@ -70,6 +71,7 @@ services:
ES_JAVA_OPTS: "-Xms512m -Xmx512m" ES_JAVA_OPTS: "-Xms512m -Xmx512m"
volumes: volumes:
- "/ext/elasticsearch:/var/lib/elasticsearch" - "/ext/elasticsearch:/var/lib/elasticsearch"
- "/opt/mcx/config/kibana/kibana.yml:/opt/kibana/config/kibana.yml"
networks: networks:
- backend - backend
fluentd-es: fluentd-es:
......
config/ipgallery-mcz/mcx-frontend.yml
...@@ -14,7 +14,9 @@ services: ...@@ -14,7 +14,9 @@ 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-verticals:13-4f061a9 image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:13-4f061a9
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:11-685384e #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:11-685384e
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:9-5b70c6a #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:9-5b70c6a
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:8-e5ef395 #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:8-e5ef395
......
config/ipgallery-mcz/ws-event-simulator.yml 0 → 100644
version: '2'
services:
ws-event-simulator:
environment:
file: "/tmp/events.json"
delay: 10
image: municipalitybank.com:5050/mcx/devops/ws-event-simulator
ports:
- "8053:8053"
volumes:
- "/opt/mcx/config/ws-event-simulator/events.json:/tmp/events.json"
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