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