diff --git a/deploy/multiple-container/combinational-deploy/default.conf b/deploy/multiple-container/combinational-deploy/default.conf index 8270b40..2c47fad 100644 --- a/deploy/multiple-container/combinational-deploy/default.conf +++ b/deploy/multiple-container/combinational-deploy/default.conf @@ -1,58 +1,3 @@ -upstream idweb { - server id_web_container:80; -} - -upstream idapi { - server id_api_container:80; -} - -upstream idums { - server id_ums_container:80; -} - -upstream biweb { - server bi_web_container:80; -} - -upstream biapi { - server bi_api_container:80; -} - -upstream bijobs { - server bi_jobs_container:80; -} - -upstream bidataservice { - server bi_dataservice_container:80; -} - -upstream bietl { - server bi_etl_container:80; -} - -upstream boldai { - server bold_ai_container:80; -} -upstream reportsweb { - server reports_web_container:80; -} - -upstream reportsapi { - server reports_api_container:80; -} - -upstream reportsjobs { - server reports_jobs_container:80; -} - -upstream reportsreportservice { - server reports_reportservice_container:80; -} - -upstream reportsviewer { - server reports_viewer_container:80; -} - #server { # listen 80; # server_name example.com; @@ -81,7 +26,7 @@ server { location / { root /application/idp/web/wwwroot; - proxy_pass http://idweb/; + proxy_pass http://id-web; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -93,7 +38,7 @@ server { fastcgi_buffer_size 32k; } location /api { - proxy_pass http://idapi/api; + proxy_pass http://id-api/api; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -104,7 +49,7 @@ server { } location /ums { root /application/idp/ums/wwwroot; - proxy_pass http://idums/ums; + proxy_pass http://id-ums/ums; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -115,7 +60,7 @@ server { } location /bi { root /application/bi/web/wwwroot; - proxy_pass http://biweb/bi; + proxy_pass http://bi-web/bi; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -125,7 +70,7 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } location /bi/api { - proxy_pass http://biapi/bi/api; + proxy_pass http://bi-api/bi/api; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -135,7 +80,7 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } location /bi/jobs { - proxy_pass http://bijobs/bi/jobs; + proxy_pass http://bi-jobs/bi/jobs; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -146,7 +91,7 @@ server { } location /bi/designer { root /application/bi/designer/wwwroot; - proxy_pass http://bidataservice; + proxy_pass http://bi-dataservice; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -156,7 +101,7 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } location /bi/designer/helper { - proxy_pass http://bidataservice/bi/designer/helper; + proxy_pass http://bi-dataservice/bi/designer/helper; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -167,7 +112,7 @@ server { } location /etlservice/ { root /application/etl/etlservice/wwwroot; - proxy_pass http://bietl/; + proxy_pass http://bi-etl/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -178,7 +123,7 @@ server { } location /etlservice/_framework/blazor.server.js { root /application/etl/etlservice/wwwroot; - proxy_pass http://bietl/_framework/blazor.server.js; + proxy_pass http://bi-etl/_framework/blazor.server.js; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -188,7 +133,7 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } location /aiservice { - proxy_pass http://boldai/aiservice; + proxy_pass http://bold-ai:8080; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -199,7 +144,7 @@ server { } location /reporting { root /application/reporting/web/wwwroot; - proxy_pass http://reportsweb/reporting; + proxy_pass http://reports-web/reporting; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -210,7 +155,7 @@ server { proxy_set_header X-Forwarded-Host $host; } location /reporting/api { - proxy_pass http://reportsapi/reporting/api; + proxy_pass http://reports-api/reporting/api; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -221,7 +166,7 @@ server { proxy_set_header X-Forwarded-Host $host; } location /reporting/jobs { - proxy_pass http://reportsjobs/reporting/jobs; + proxy_pass http://reports-jobs/reporting/jobs; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -233,7 +178,7 @@ server { } location /reporting/reportservice { root /application/reporting/reportservice/wwwroot; - proxy_pass http://reportsreportservice/reporting/reportservice; + proxy_pass http://reports-reportservice/reporting/reportservice; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; @@ -245,7 +190,7 @@ server { } location /reporting/viewer { root /application/reporting/viewer; - proxy_pass http://reportsviewer/reporting/viewer; + proxy_pass http://reports-viewer/reporting/viewer; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection keep-alive; diff --git a/deploy/multiple-container/combinational-deploy/docker-compose.yml b/deploy/multiple-container/combinational-deploy/docker-compose.yml index de6bd9b..11d4e7a 100644 --- a/deploy/multiple-container/combinational-deploy/docker-compose.yml +++ b/deploy/multiple-container/combinational-deploy/docker-compose.yml @@ -29,7 +29,8 @@ services: networks: - boldservices depends_on: - - id-web + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -47,7 +48,8 @@ services: networks: - boldservices depends_on: - - id-web + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -63,7 +65,8 @@ services: networks: - boldservices depends_on: - - id-web + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -79,8 +82,10 @@ services: networks: - boldservices depends_on: - - id-web - - bi-web + bi-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -96,8 +101,10 @@ services: networks: - boldservices depends_on: - - id-web - - bi-web + bi-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -108,17 +115,20 @@ services: container_name: bi_dataservice_container image: us-docker.pkg.dev/boldbi-294612/boldbi/boldbi-designer:15.1.65 restart: on-failure - # environment: ## Refer README.md for available environment variables. + environment: ## Refer README.md for available environment variables. # - widget_bing_map_enable=false # - widget_bing_map_api_key="" # - AppSettings__locale-path="" + - INSTALL_OPTIONAL_LIBS=mongodb,mysql,influxdb,snowflake,oracle,clickhouse,google volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web - - bi-web + bi-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -134,8 +144,10 @@ services: networks: - boldservices depends_on: - - id-web - - bi-web + bi-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -151,39 +163,46 @@ services: networks: - boldservices depends_on: - - id-web - - bi-web + bi-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: - test: ["CMD", "curl", "-f", "http://localhost/health-check"] + test: ["CMD", "curl", "-f", "http://localhost:8080/health-check"] interval: 10s timeout: 10s retries: 5 + reports-web: container_name: reports_web_container - image: us-docker.pkg.dev/boldreports/v11-1-10/boldreports-server:11.1.10 + image: us-docker.pkg.dev/boldreports/multi-container/boldreports-server:12.2.6 restart: on-failure volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s timeout: 10s retries: 5 + reports-api: container_name: reports_api_container - image: us-docker.pkg.dev/boldreports/v11-1-10/boldreports-server-api:11.1.10 + image: us-docker.pkg.dev/boldreports/multi-container/boldreports-server-api:12.2.6 restart: on-failure volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web - - reports-web + reports-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -192,16 +211,19 @@ services: reports-jobs: container_name: reports_jobs_container - image: us-docker.pkg.dev/boldreports/v11-1-10/boldreports-server-jobs:11.1.10 + image: us-docker.pkg.dev/boldreports/multi-container/boldreports-server-jobs:12.2.6 restart: on-failure volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web - - reports-web - - reports-api + reports-web: + condition: service_started + reports-api: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -210,16 +232,19 @@ services: reports-reportservice: container_name: reports_reportservice_container - image: us-docker.pkg.dev/boldreports/v11-1-10/boldreports-designer:11.1.10 + image: us-docker.pkg.dev/boldreports/multi-container/boldreports-designer:12.2.6 restart: on-failure volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web - - reports-web - - reports-api + reports-web: + condition: service_started + reports-api: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -228,15 +253,17 @@ services: reports-viewer: container_name: reports_viewer_container - image: us-docker.pkg.dev/boldreports/v11-1-10/boldreports-viewer:11.1.10 + image: us-docker.pkg.dev/boldreports/multi-container/boldreports-viewer:12.2.6 restart: on-failure volumes: - boldservices_data:/application/app_data networks: - boldservices depends_on: - - id-web - - reports-web + reports-web: + condition: service_started + id-web: + condition: service_healthy healthcheck: test: ["CMD", "curl", "-f", "http://localhost/health-check"] interval: 10s @@ -260,19 +287,32 @@ services: networks: - boldservices depends_on: - - id-web - - id-api - - id-ums - - bi-web - - bi-api - - bi-jobs - - bi-dataservice - - bold-ai - - reports-web - - reports-api - - reports-jobs - - reports-reportservice - - reports-viewer + id-web: + condition: service_healthy + id-api: + condition: service_started + id-ums: + condition: service_started + bi-web: + condition: service_started + bi-api: + condition: service_started + bi-jobs: + condition: service_started + bi-dataservice: + condition: service_started + bold-ai: + condition: service_started + reports-web: + condition: service_started + reports-api: + condition: service_started + reports-jobs: + condition: service_started + reports-reportservice: + condition: service_started + reports-viewer: + condition: service_started pgdb: image: postgres:17 restart: always