Commit c0f0034c by Gil Sade

changed to new scripts

parent a68a37b0
......@@ -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
......
......@@ -4,52 +4,51 @@ services:
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"
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-latest
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"
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:client-latest
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"
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"
......@@ -58,42 +57,35 @@ services:
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