Skip to content

ipgallery / devops

Go to a project
Commit c0f0034c by Gil Sade
Options

changed to new scripts

parent a68a37b0
Inline Side-by-side
Showing with 177 additions and 130 deletions
config/local-testing/mcx-backend.yml
......@@ -4,19 +4,20 @@ services:
ds:
environment:
IPG_ENV_PARAMS: "-Dmongodb.port=27017#\
-Dds.mongodb.host=172.16.1.72#\
-Dds.mongodb.host=mongodb#\
-Dredis.port=6379#\
-Dredis.host=172.16.1.72#\
-Dredis.host=redis#\
-DconfigFile.location=/opt/mcx/config#\
-Dmcz.files.location=/opt/mcx#\
-Dds.orientdb.url=remote:orientdb#\
-Ddao.use.cache=false#\
-Ddao.es.activity.url=activityidx/activity#\
-Dserver.worker.threads=4#\
-Ddao.es.activity.hostport=172.16.1.72:9200"
-Ddao.es.activity.hostport=elk:9200"
# -Dds.sap.hana.url=35.156.55.64:8000#\
# -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/ds
image: municipalitybank.com:5050/mcx/ds:37-43b2b94
# image: 172.16.1.212:5050/mcx/ds:21-837052
ports:
- "8012:50050"
- "7443:8443"
......@@ -26,76 +27,75 @@ services:
###### transportation ###################
transportation:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim,san-jose#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
-Ddemo.changeRandomality=6#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
-Dtransportation.updateTrafficLaneTimeout=30000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dtransportation.updateTrafficLaneTimeout=3600000#\
-Dds.ip=172.16.1.72:8012#\
-Dtransportation.dsServer.address=172.16.1.72:8012#\
-Dtransportation.server.address=172.16.1.244:50035#\
-Dtransportation.mdeServer.address=172.16.1.72:50040#\
-Dtransportation.mde2Server.address=172.16.1.72:50041#\
-Dpubsub.host=172.16.1.244#\
-Dpubsub.port=1885"
-Dds.ip=ds:50050#\
-Dtransportation.dsServer.address=ds:50050#\
-Dtransportation.server.address=transportation:50035#\
-Dtransportation.mdeServer.address=mde:50040#\
-Dtransportation.mde2Server.address=mde2:50041#\
-Dpubsub.host=mqtt#\
-Dpubsub.port=1883"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/transportation
image: municipalitybank.com:5050/mcx/transportation:9-c254299
# image: municipalitybank.com:5050/mcx/transportation:4-e7b2bf7
# image: 172.16.1.212:5050/mcx/transportation:29-9207d8
networks:
- backend
# image: 172.16.1.212:5050/mcx/transportation:27-2bb5a9
ports:
- "8300:8000"
- "50035:50035"
# volumes:
# - "/opt/mcx/config/transportation/:/opt/mcx/config/"
networks:
- backend
####### parking ###################
parking:
environment:
IPG_ENV_PARAMS: "-DdemoMode=san-diego,minneapolis,chicago,modiin,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
-Dredis.host=redis#\
-Dparking.server.address=parking:50055#\
-Dds.IpAddress=ds:50050#\
-Dds.ip=ds:50050#\
-Dmde.IpAddress=mde:50040#\
-Dmde.IpAddress=mde2:50041#\
-Ddemo.changeRandomality=9#\
-Dpubsub.host=172.16.1.244#\
-Dpubsub.port=1885#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/parking
image: municipalitybank.com:5050/mcx/parking:6-e184f20
# image: 172.16.1.212:5050/mcx/parking:20-d72ebf
# ports:
# - "8015:8000"
# - "50055:50055"
networks:
- backend
ports:
- "8015:8000"
- "50055:50055"
# volumes:
# - "/opt/mcx/config/parking/:/opt/mcx/config/"
## PUBLIC SFAETY
public-safety:
environment:
IPG_ENV_PARAMS: "-DdemoMode=pedestrian@san-diego,minneapolis,modiin,chicago,givatayim,pedestrian@san-jose#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
-DpublicSafety.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
# -Dhystrix.threadpool.default.maxQueueSize=1500#\
# -Dhystrix.threadpool.HystrixThreadPoolKey.maximumSize=1500#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DpublicSafety.server.address=public-safety:50005#\
-Dredis.host=redis#\
-DpublicSafety.env.checkEventsDaysBack=180#\
-DconfigLocation=/opt/mcx/config/#\
-DpublicSafety.dsServer.address=ds:50050#\
-Dds.ip=ds:50050#\
-DpublicSafety.env.checkEventsInitialDelay=60#\
-DpublicSafety.env.checkEventsEveryPeriod=300#\
-DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.env.checkEventsDaysBack=180"
# -DpublicSafety.env.forceCheckTimestamp=1492892647529#\
-DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety
image: municipalitybank.com:5050/mcx/public-safety:19-3b62940
# image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb
ports:
- "8100:8000"
- "50005:50005"
volumes:
- "/opt/mcx/config/repo/public-safety:/opt/mcx/config/repo/public-safety"
- "/opt/mcx/config/PublicSafety:/opt/mcx/config/"
networks:
- backend
ui-api:
......@@ -106,33 +106,36 @@ services:
-Dds.ip=ds:50050#\
-Dsrg.sip.hostport=srg:5076#\
-Dmcweb.sip.ip=ui-api:5060#\
-Dmcweb.ip=172.16.1.244:8011#\
-Dmcweb.ip=172.16.1.72:8011#\
-Dredis.host=redis#\
-Dredis.port=6379#\
-DconfigFile.location=/opt/mcx/config#\
-Dmcz.files.location=/opt/mcz#\
-Dpush.server.url=push-server:50000#\
-Dcity.reports=chicago,san-diego#\
-Duse.schedular=true#\
-Dconfig.public.address=ipgallery-mcz.com:8097#\
-Dpubsub.url=wss://ipgallery-mcz.com:8244/mqtt#\
-Dcity.reports=san-diego,chicago#\
-Dconfig.public.address=ipgallery-mcz.com:8072#\
-Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\
-Dpubsub.url=wss://ipgallery-mcz.com:8072/mqtt#\
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
image: municipalitybank.com:5050/mcx/ui
image: municipalitybank.com:5050/mcx/ui:13-a788e7f
ports:
- "8011:8080"
- "9443:8443"
- "9085:9080"
- "9080:9080"
volumes:
- "/opt/mcz/user_images:/opt/mcz/user_images"
networks:
- backend
depends_on:
- srg
### DATA-LOGIC ###
data-logic:
environment:
IPG_ENV_PARAMS: "-Dds.IpAddress=ds:50050#\
-Dredis.host=redis"
image: municipalitybank.com:5050/mcx/data-logic
image: municipalitybank.com:5050/mcx/data-logic:7-e7171be
# image: 172.16.1.212:5050/mcx/data-logic:4-b354b7
ports:
- "8110:8000"
- "50045:50045"
......@@ -143,7 +146,8 @@ services:
environment:
IPG_ENV_PARAMS: "-Dredis.host=redis"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/push-server
image: municipalitybank.com:5050/mcx/push-server:8-8d10c0
# image: 172.16.1.212:5050/mcx/push-server:7-5847b1
ports:
- "8120:8000"
- "50000:50000"
......@@ -155,18 +159,20 @@ services:
IPG_ENV_PARAMS: "-Dds.ip=ds:50050#\
-Dredis.host=redis#\
-Dsrg.sip.hostport=srg:5076#\
-Dexternal.host.port=172.16.1.244:5076#\
-Dexternal.host.port=172.16.1.72:5076#\
-Drcs.send.message.url=http://srg:8060/srg/chat/v1/standalone/sendmessage#\
-Dpush.server.bulk=20#\
-Dpush.server.url=push-server:50000#\
-Dserver.worker.threads=1"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/comm-logic
image: municipalitybank.com:5050/mcx/comm-logic:16-9ac3c59
# image: 172.16.1.212:5050/mcx/comm-logic:16-16e2b7
ports:
- "8130:8000"
- "50030:50030"
networks:
- backend
# log_driver: fluentd
srg:
environment:
IPSIPStack_HostName: srg
......@@ -182,7 +188,7 @@ services:
# extra_hosts:
# - "pcscf.open-ims.test:0.0.0.0"
# - "scscf.open-ims.test:172.16.1.244"
image: municipalitybank.com:5050/mcx/mcx/srg
image: 172.16.1.132:5000/ipgallery/srg
ports:
- "5076:5076/udp"
- "7681:7681"
......@@ -195,23 +201,31 @@ services:
## PUBLIC SFAETY-IC
public-safety-ic:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago#\
-Ddemo.changeRandomality=6#\
-Dds.IpAddress=ds:50050#\
IPG_ENV_PARAMS: "-Dds.IpAddress=ds:50050#\
-Dredis.host=redis#\
-DconfigFile.location=/opt/mcx/config/ICPublicSafety/config.properties#\
-DconfigLocation=/opt/mcx/config/ICPublicSafety/#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-DconfigFile.location=/opt/mcx/config/ICPublicSafety/config.properties
-DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety:ic-latest
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-19-9fb286e80940947addfeb342169e44f20f7134ab
ports:
- "8400:8000"
- "50004:50004"
volumes:
- "/opt/mcx/config/ICPublicSafety/:/opt/mcx/config/ICPublicSafety/"
networks:
- backend
## COM SERVICE
comm-service:
image: municipalitybank.com:5050/mcx/comm-service:1-4-sync-cb
# image: municipalitybank.com:5050/mcx/comm-service:latest
environment:
PARGS: "-m server -p 50000 -s id#rest#http"
log4cpp.console: "yes"
flushEveryLog: "yes"
ports:
- "50060:50060"
networks:
- backend
###### mde ###################
mde:
environment:
......@@ -222,16 +236,57 @@ services:
-Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
-Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/mde
image: municipalitybank.com:5050/mcx/mde:12-fd8faf7
# image: 172.16.1.212:5050/mcx/mde:19-3ebc7c
# image: 172.16.1.212:5050/mcx/mde:15-f25d9f
ports:
- "8200:8000"
- "50040:50040"
# extra_hosts:
# - "parking:172.16.1.97"
# - "transportation:172.16.1.97"
# - "public-safety:172.16.1.97"
# extra_hosts:
# - "parking:178.62.63.127"
# - "transportation:178.62.63.127"
# - "public-safety:178.62.63.127"
networks:
- backend
- backend
###### mde2 ###################
mde2:
environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler"
DEBUG_apiHandler: "yes"
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060"
DEBUG_httpAdapter: "yes"
ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
-DconfigLocation=/opt/mcx/config/apiService/#\
-Dredis.host=redis#\
-Dmde.cisco.username=devoperator11@cdp.com#\
-Dmde.cisco.password=ejlFK0g9OSRK#\
-Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
-Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:4-36b09f9
#image: municipalitybank.com:5050/mcx/mde2:2-e9c7d03
ports:
- "8040:8140" # apiHandler debug port
- "8041:8141" # apiService debug port
- "8042:8142" # httpAdapter debug port
- "8043:8043" # admin debug port
- "50041:50041" # mde2(apiService) listening port
- "50042:50042" # mde2(httpAdapter) listening port
- "50043:50043" # mde2(admin) listening port
networks:
- backend
networks:
backend:
driver: bridge
config/local-testing/mcx-external.yml
......@@ -47,14 +47,14 @@ services:
volumes:
- /var/otp/graphs:/var/otp/graphs
environment:
JAVA_ARGS: "-Xms512m -Xmx512m"
JAVA_ARGS: "-Xms256m -Xmx512m"
command: --autoScan --server
networks:
- backend
mqtt:
image: eclipse-mosquitto
ports:
- "8040:8080"
- "8050:8080"
- "1885:1883"
volumes:
- /opt/mcx/config/mosquitto/mosquitto.conf:/mosquitto/config/mosquitto.conf
......
config/local-testing/mcx-frontend.yml
......@@ -3,97 +3,89 @@ services:
### UI-WEB-CONTROL (NGINX + WEB)
ui-web-control:
environment:
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "172.16.1.72:5601"
CAMERA_STREAM: "172.16.1.141:81"
CAMERA_API: "172.16.1.142:9090"
PUBLIC_SAFETY_CAMERA: "12.160.166.34:17000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681"
image: municipalitybank.com:5050/mcx/ui-web:control-center-latest
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
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-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef
volumes:
- "/home/amir/temp/log:/var/log/nginx"
- "/home/amir/git/ipgallery/ui-web/target:/usr/share/nginx/html"
- "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
networks:
- backend
### UI-WEB-CLIENT (NGINX + WEB)
ui-web-client:
image: municipalitybank.com:5050/mcx/ui-web/client:21-dfcfa2d
#image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965
# image: 172.16.1.212:5050/mcx/ui-web:client-25-fc74e8fe1b9cf7fbca90ad3b4da9fc3187bf4d1e
environment:
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "172.16.1.72:5601"
CAMERA_STREAM: "172.16.1.141:81"
CAMERA_API: "172.16.1.142:9090"
PUBLIC_SAFETY_CAMERA: "12.160.166.34:17000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681"
image: municipalitybank.com:5050/mcx/ui-web:client-latest
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681"
networks:
- backend
# volumes:
# - "/home/amir/temp/log:/var/log/nginx"
# - "/home/amir/git/ipgallery/ui-web/target:/usr/share/nginx/html"
### UI-WEB-DRIVER (NGINX + WEB)
ui-web-driver:
image: municipalitybank.com:5050/mcx/ui-web:driver-latest
# image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01
image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
environment:
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "172.16.1.72:5601"
CAMERA_STREAM: "172.16.1.141:81"
CAMERA_API: "172.16.1.142:9090"
PUBLIC_SAFETY_CAMERA: "12.160.166.34:17000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681"
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
PUBLIC_SAFETY_SERVER_HOSTPORT: "public-safety:50005"
UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681"
networks:
- backend
# volumes:
# - "/home/gil/temp/log:/var/log/nginx"
# - "/home/gil/git/ui-web/target:/usr/share/nginx/html"
## FRONT END
front-end:
environment:
OTP_SERVER: "otp:8081"
KIBANA_SERVER: "172.16.1.72:5601"
CAMERA_STREAM: "172.16.1.141:81"
CAMERA_API: "172.16.1.142:9090"
PUBLIC_SAFETY_CAMERA: "12.160.166.34:17000"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
TRANSPORTATION_SERVER: "transportation:50035"
PARKING_SERVER: "parking:50055"
UI_API_PORT_8080_TCP_ADDR: "ui-api"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
PUBLIC_SAFETY_IC_PORT_50004_TCP_PORT: "50004"
PUBLIC_SAFETY_PORT_50005_TCP_ADDR: "public-safety"
PUBLIC_SAFETY_PORT_50005_TCP_PORT: "50005"
UI_API_PORT_8080_TCP_ADDR: "ui-api"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_PORT_7681_TCP_ADDR: "srg"
SRG_PORT_7681_TCP_PORT: "7681"
EMAIL: "avi.junowicz@ipgallery.com"
URL: "ipgallery-mcz.com:8244"
SUBDOMAINS: ""
PGID: "911"
PUID: "911"
ONLY_SUBDOMAINS: "false"
URL: "ipgallery-mcz.com"
TZ: "Israel"
PGID: 991
PUID: 991
MAKE_CERT: "false"
image: municipalitybank.com:5050/mcx/front-end
image: municipalitybank.com:5050/mcx/front-end:19-d2f0bbb
# image: municipalitybank.com:5050/mcx/front-end/develop-new-letsencrypt
# image: municipalitybank.com:5050/mcx/front-end:18-c45b301
ports:
- "8025:80"
- "8443:443"
- "8444:444"
privileged: true
- "443:443"
volumes:
- "/tmp/log:/var/log/nginx"
- "/opt/mcz/config-letsencrypt/:/config:rw"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
networks:
- backend
networks:
......
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