Skip to content

ipgallery / devops

Go to a project
Commit 2ca71e7c by Avi Junowicz
Options

New docker-compose for ge,transport and parking, and front-end,control and client

parent 41c67581
Inline Side-by-side
Showing with 74 additions and 47 deletions
docker/composers/mcx-poc-front-control-client.yml
ui-api:
environment:
IPG_ENV_PARAMS: "-DdataLogic.IpAddress=172.16.1.97:50045#\
IPG_ENV_PARAMS: "-DdataLogic.IpAddress=172.16.1.33:50045#\
-Dmongodb.port=27017#\
-Dds.ip.address=172.16.1.97#\
-Dds.ip=172.16.1.97:8012#\
-Dsrg.sip.hostport=172.16.1.97:5076#\
-Dmcweb.sip.ip=172.16.1.97:5060#\
-Dmcweb.ip=172.16.1.97:8011#\
-Dredis.host=172.16.1.97#\
-Dds.ip.address=172.16.1.33#\
-Dds.ip=172.16.1.33:8012#\
-Dsrg.sip.hostport=172.16.1.33:5076#\
-Dmcweb.sip.ip=172.16.1.33:5060#\
-Dmcweb.ip=172.16.1.33:8011#\
-Dredis.host=172.16.1.33#\
-Dredis.port=6379#\
-DconfigFile.location=/opt/mcx/config#\
-Dmcz.files.location=/opt/mcz#\
-Dpush.server.url=172.16.1.97:50000#\
-Dcity.reports=san-diego#\
-Dpush.server.url=172.16.1.33:50000#\
-Duse.schedular=true#\
-Dconfig.public.address=commetoo.com:443#\
-Drcs.send.message.url=http://172.16.1.97:8060/srg/chat/v1/standalone/sendmessage#\
-Dcity.reports=san-diego#\
-Dconfig.public.address=ipgallery-mcz.com:8033#\
-Drcs.send.message.url=http://172.16.1.33:8060/srg/chat/v1/standalone/sendmessage#\
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
image: 172.16.1.212:5050/mcx/ui
ports:
......@@ -27,12 +27,12 @@ ui-api:
# log_driver: fluentd
# example for remote fluentd agent
# log_opt:
# fluentd-address: 172.16.1.97:24224
# fluentd-address: 172.16.1.33:24224
# fluentd-tag: ui-api
#public-safety:
# environment:
# IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.97:8080#\
# -Dredis.host=172.16.1.97#\
# IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8080#\
# -Dredis.host=172.16.1.33#\
# -Dinflux.hostport=172.16.1.244:8086"
# USE_DEBUG: "yes"
# image: 172.16.1.212:5050/mcx/public-safety
......@@ -43,8 +43,8 @@ ui-api:
### DATA-LOGIC ###
data-logic:
environment:
IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.97:8012#\
-Dredis.host=172.16.1.97"
IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
-Dredis.host=172.16.1.33"
image: 172.16.1.212:5050/mcx/data-logic
ports:
- "8110:8000"
......@@ -53,7 +53,7 @@ data-logic:
### PUSH-SERVER ###
push-server:
environment:
IPG_ENV_PARAMS: "-Dredis.host=172.16.1.97"
IPG_ENV_PARAMS: "-Dredis.host=172.16.1.33"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/push-server
ports:
......@@ -65,8 +65,8 @@ 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/app:/usr/share/nginx/html/app"
# volumes:
# - "/home/gil/git/ui-web/target/app:/usr/share/nginx/html/app"
### UI-WEB-CLIENT (NGINX + WEB)
ui-web-client:
image: 172.16.1.212:5050/mcx/ui-web:client-latest
......@@ -79,13 +79,13 @@ ui-web-client:
### SRG + COMM-LOGIC
comm-logic:
environment:
IPG_ENV_PARAMS: "-Dds.ip=172.16.1.97:8012#\
-Dredis.host=172.16.1.97#\
-Dsrg.sip.hostport=172.16.1.97:5076#\
-Dexternal.host.port=172.16.1.97:5076#\
-Drcs.send.message.url=http://172.16.1.97:8060/srg/chat/v1/standalone/sendmessage#\
IPG_ENV_PARAMS: "-Dds.ip=172.16.1.33:8012#\
-Dredis.host=172.16.1.33#\
-Dsrg.sip.hostport=172.16.1.33:5076#\
-Dexternal.host.port=172.16.1.33:5076#\
-Drcs.send.message.url=http://172.16.1.33:8060/srg/chat/v1/standalone/sendmessage#\
-Dpush.server.bulk=20#\
-Dpush.server.url=172.16.1.97:50000#\
-Dpush.server.url=172.16.1.33:50000#\
-Dserver.worker.threads=1"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/comm-logic
......@@ -95,7 +95,7 @@ comm-logic:
# log_driver: fluentd
srg:
environment:
IPSIPStack_HostName: 172.16.1.97
IPSIPStack_HostName: 172.16.1.33
IPSIPStack_InternalHostNameComSrv: 0.0.0.0
IPSIPStack_NumOfPorts: 1
IPSIPStack_Port1Number: 5076
......@@ -103,8 +103,8 @@ srg:
IPSIPStack_UseWebSocket: Y
IPSIPStack_WebSocketServerPortNumber: 7681
SessCntrl_RegisterPortNumber: 5076
SIPC_MyHostName: 172.16.1.97:8080
SIPC_MCServicesServerHost: http://172.16.1.97:50030/CommLogic/api/
SIPC_MyHostName: 172.16.1.33:8080
SIPC_MCServicesServerHost: http://172.16.1.33:50030/CommLogic/api/
# extra_hosts:
# - "pcscf.open-ims.test:0.0.0.0"
# - "scscf.open-ims.test:172.16.1.244"
......@@ -120,16 +120,16 @@ srg:
ds:
environment:
IPG_ENV_PARAMS: "-Dmongodb.port=27017#\
-Dds.mongodb.host=172.16.1.97#\
-Dds.mongodb.host=172.16.1.33#\
-Dredis.port=6379#\
-Dredis.host=172.16.1.97#\
-Dredis.host=172.16.1.33#\
-DconfigFile.location=/opt/mcx/config#\
-Dmcz.files.location=/opt/mcx#\
-Dds.orientdb.url=remote:172.16.1.97#\
-Dds.orientdb.url=remote:172.16.1.33#\
# -Dds.sap.hana.url=35.156.55.64:8000#\
-Ddao.use.cache=false#\
-Ddao.es.activity.url=activityidx/activity#\
-Ddao.es.activity.hostport=172.16.1.50:9200"
-Ddao.es.activity.hostport=172.16.1.33:9200"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/ds
ports:
......@@ -139,28 +139,54 @@ ds:
## FRONT END
front-end:
environment:
OTP_SERVER: "172.16.1.29:8081"
KIBANA_SERVER: "172.16.1.50:5601"
OTP_SERVER: "172.16.1.33:8081"
KIBANA_SERVER: "172.16.1.33: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.50:50035"
PARKING_SERVER: "172.16.1.50:50055"
TRANSPORTATION_SERVER: "172.16.1.33:50035"
PARKING_SERVER: "172.16.1.33:50055"
EMAIL: "avi.junowicz@ipgallery.com"
URL: "commetoo.com"
SUBDOMAINS: "mcz"
URL: "ipgallery-mcz.com"
SUBDOMAINS: ""
TZ: "Israel"
image: 172.16.1.212:5050/mcx/front-end
ports:
- "8020:80"
- "8443:443"
- "8444:444"
- "80:80"
- "443:443"
- "444:444"
links:
- ui-api
- srg
- ui-web-client
- ui-web-control
- public-safety
privileged: true
volumes:
- "/home/gil/temp/log:/var/log/nginx"
- "/opt/mcz/config-letsencrypt/:/config:rw"
###### 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"
## Public Safety ####
public-safety:
environment:
IPG_ENV_PARAMS: "-Dds.IpAddress=172.16.1.33:8012#\
-Dredis.host=172.16.1.33#\
-Duse.iot.reporting=false"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/public-safety
ports:
- "50005:50005"
volumes:
- "/opt/mcx/config/PublicSafety/:/opt/mcx/config/PublicSafety/"
# log_driver: fluentd
docker/composers/mcx-poc-ge.yml
......@@ -78,7 +78,7 @@ ui-web:
URL: "ipgallery-mcz.com"
SUBDOMAINS: ""
TZ: "Israel"
image: 172.16.1.212:5050/mcx/ui-web:control-center-latest
image: 172.16.1.212:5050/mcx/ui-web:control-center-san-diego-latest
ports:
- "80:80"
- "443:443"
......@@ -139,7 +139,7 @@ ds:
-Dredis.host=172.16.1.50#\
-DconfigFile.location=/opt/mcx/config#\
-Dmcz.files.location=/opt/mcx#\
-Dds.orientdb.url=remote:172.16.1.244#\
-Dds.orientdb.url=remote:172.16.1.50#\
-Dds.sap.hana.url=35.156.55.64:8000#\
-Ddao.use.cache=false#\
-Ddao.es.activity.url=activityidx/activity#\
......
docker/composers/mcx-poc-trans-park.yml
......@@ -11,18 +11,19 @@ transportation:
-Dds.ip=172.16.1.50:8012#\
-DtenantsFile=/opt/mcx/config/tenants.json"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/transportation
image: 172.16.1.212:5050/mcx/transportation:4-6b8ab5
ports:
- "8300:8000"
- "50035:50035"
###### parking ###################
####### parking ###################
parking:
environment:
IPG_ENV_PARAMS: "-Dredis.host=172.16.1.50#\
-Dds.IpAddress=172.16.1.50:8012#\
-Dds.ip=172.16.1.50:8012#\
-Dmde.IpAddress=172.16.1.50:50040#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#"
-Ddiscover.parking.spots.from.mde=true#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/parking
ports:
......
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