MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into budi-9128-convert-star-rating-plugin-to-native-component

This commit is contained in:
Andrew Thompson 2025-04-08 15:57:28 +01:00 committed by GitHub
parent e0bca88512 90c4963125
commit 573c31960d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosting/proxy/Dockerfile
View File

@ -17,6 +17,7 @@ COPY error.html /usr/share/nginx/html/error.html
# Default environment # Default environment
ENV PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10 ENV PROXY_RATE_LIMIT_WEBHOOKS_PER_SECOND=10
ENV PROXY_RATE_LIMIT_API_PER_SECOND=20 ENV PROXY_RATE_LIMIT_API_PER_SECOND=20
ENV PROXY_TIMEOUT_SECONDS=120
# Use docker-compose values as defaults for backwards compatibility # Use docker-compose values as defaults for backwards compatibility
ENV APPS_UPSTREAM_URL=http://app-service:4002 ENV APPS_UPSTREAM_URL=http://app-service:4002
ENV WORKER_UPSTREAM_URL=http://worker-service:4003 ENV WORKER_UPSTREAM_URL=http://worker-service:4003

12
hosting/proxy/nginx.prod.conf
View File

@ -144,9 +144,9 @@ http {
limit_req zone=ratelimit burst=20 nodelay; limit_req zone=ratelimit burst=20 nodelay;
# 120s timeout on API requests # 120s timeout on API requests
proxy_read_timeout 120s; proxy_read_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_connect_timeout 120s; proxy_connect_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_send_timeout 120s; proxy_send_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
@ -164,9 +164,9 @@ http {
# Rest of configuration copied from /api/ location above # Rest of configuration copied from /api/ location above
# 120s timeout on API requests # 120s timeout on API requests
proxy_read_timeout 120s; proxy_read_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_connect_timeout 120s; proxy_connect_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_send_timeout 120s; proxy_send_timeout ${PROXY_TIMEOUT_SECONDS}s;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;