Skip to content

ipgallery / devops

Go to a project
Commit 3948d6b1 by Amir Aharon
Options

adding Profile file as env to front-end

parent 34a31d5d
Expand all
Inline Side-by-side
Showing with 127 additions and 22 deletions
config/local-testing/front-end/nginx.conf 0 → 100644
user nginx;
worker_processes 1;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
env PROFILE_FILE_NAME;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
keepalive_timeout 65;
#gzip on;
include /etc/nginx/conf.d/*.conf;
}
config/local-testing/mcx-frontend.yml
...@@ -3,8 +3,8 @@ services: ...@@ -3,8 +3,8 @@ 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: "kibana: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"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000" PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
...@@ -14,20 +14,32 @@ services: ...@@ -14,20 +14,32 @@ 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:43-da07258
#image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef # image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:41-485bdaa
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:40-5dfdcda
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:39-ffad3bf
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:38-1048a5b
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:37-a980cf0
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:36-c942063
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:35-43efe5b
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:34-47bf4a9
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:33-9b31cf8
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:32-968ff76
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:30-8b4e45a
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:
- backend - backend
### UI-WEB-CLIENT (NGINX + WEB) ### UI-WEB-CLIENT (NGINX + WEB)
ui-web-client: ui-web-client:
image: municipalitybank.com:5050/mcx/ui-web/client:21-dfcfa2d image: municipalitybank.com:5050/mcx/ui-web/client:28-6d88ee7
# image: municipalitybank.com:5050/mcx/ui-web/client:27-d55dad3
# image: municipalitybank.com:5050/mcx/ui-web/client:21-dfcfa2d
#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: "kibana: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"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000" PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
...@@ -41,11 +53,12 @@ services: ...@@ -41,11 +53,12 @@ services:
- backend - backend
### UI-WEB-DRIVER (NGINX + WEB) ### UI-WEB-DRIVER (NGINX + WEB)
ui-web-driver: ui-web-driver:
image: municipalitybank.com:5050/ipgallery.web/driver:2-8af1450
# 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: "kibana: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"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000" PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
...@@ -57,11 +70,36 @@ services: ...@@ -57,11 +70,36 @@ services:
SRG_SERVER_HOSTPORT: "srg:7681" SRG_SERVER_HOSTPORT: "srg:7681"
networks: networks:
- backend - backend
## CONTROL-CENTER-NEW
control-center:
image: municipalitybank.com:5050/ipgallery.web/control-center:52-3a16cae
# image: municipalitybank.com:5050/ipgallery.web/control-center:51-b52ae5d
# image: municipalitybank.com:5050/ipgallery.web/control-center:50-d2832a9
# image: municipalitybank.com:5050/ipgallery.web/control-center:49-3699a0e
# image: municipalitybank.com:5050/ipgallery.web/control-center:48-2035470
# image: municipalitybank.com:5050/ipgallery.web/control-center:45-dfc8e44
# image: municipalitybank.com:5050/ipgallery.web/control-center:44-cd53f18
# image: municipalitybank.com:5050/ipgallery.web/control-center:44-cd53f18
# image: municipalitybank.com:5050/ipgallery.web/control-center:43-d617167
# image: municipalitybank.com:5050/ipgallery.web/control-center:42-6af9c7a
# image: municipalitybank.com:5050/ipgallery.web/control-center:38-e011a84
# image: municipalitybank.com:5050/ipgallery.web/control-center:36-ccb08f4
# image: municipalitybank.com:5050/ipgallery.web/control-center:34-969ced1
# image: municipalitybank.com:5050/ipgallery.web/control-center:33-6d624c9
# image: municipalitybank.com:5050/ipgallery.web/control-center:32-1182ad7
# image: municipalitybank.com:5050/ipgallery.web/control-center:31-cdab784
# image: municipalitybank.com:5050/ipgallery.web/control-center:30-3f6ec96
# image: municipalitybank.com:5050/ipgallery.web/control-center:25-39b1f5d
networks:
- backend
## FRONT END ## FRONT END
front-end: front-end:
image: firesh/nginx-lua
# image: nginx
environment: environment:
OTP_SERVER: "otp:8081" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "kibana: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"
PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000" PUBLIC_SAFETY_CAMERA: "24.172.188.211:16000"
...@@ -73,21 +111,55 @@ services: ...@@ -73,21 +111,55 @@ services:
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic" PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_PORT_7681_TCP_ADDR: "srg" SRG_PORT_7681_TCP_ADDR: "srg"
SRG_PORT_7681_TCP_PORT: "7681" SRG_PORT_7681_TCP_PORT: "7681"
PGID: "911" PROFILE_FILE_NAME: "38DT6ptK3WL0NYi"
PUID: "911"
ONLY_SUBDOMAINS: "false"
URL: "ipgallery-mcz.com"
TZ: "Israel"
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: ports:
- "80:80"
- "443:443" - "443:443"
volumes: volumes:
- "/opt/mcz/config-letsencrypt/:/config:rw" - "/opt/mcz/config-letsencrypt/:/config"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw" - "/opt/mcx/config/front-end/default:/etc/nginx/conf.d"
- "/opt/mcx/config/front-end/nginx.conf:/etc/nginx/nginx.conf"
- "/tmp/log:/var/log/nginx"
extra_hosts:
- "mqtt:172.16.1.80"
- "grafana:172.16.1.80"
- "kibana:172.16.1.80"
# - "scp:172.16.1.244"
networks: networks:
- backend - backend
## FRONT END
# front-end:
# environment:
# OTP_SERVER: "ipgallery-mcz.com:8099"
# KIBANA_SERVER: "kibana: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_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"
# PGID: "911"
# PUID: "911"
# ONLY_SUBDOMAINS: "false"
# URL: "ipgallery-mcz.com"
# TZ: "Israel"
# MAKE_CERT: "false"
# image: municipalitybank.com:5050/mcx/front-end:26-29ece50
## image: municipalitybank.com:5050/mcx/front-end:24-ebb7806
# ports:
# - "443:443"
# volumes:
# - "/opt/mcz/config-letsencrypt/:/config:rw"
# - "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
## extra_hosts:
## - "grafana:172.16.1.244"
# networks:
# - backend
networks: networks:
backend: backend:
driver: bridge driver: bridge
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