Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(docker): ENTESB-16897 - provide nginx performance tuning via env vars #86

Merged
merged 1 commit into from
Sep 28, 2021
Merged

feat(docker): ENTESB-16897 - provide nginx performance tuning via env vars #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ ADD packages/ packages/
RUN yarn install
RUN gulp --series build site

# Build stage to extract envsubst
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3 as envsubst

RUN microdnf -y install gettext

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3

# njs > 0.4.3 fails to run js-yaml.js
Expand Down Expand Up @@ -63,9 +68,10 @@ RUN touch config.js && \
ln -sf /config.js /usr/share/nginx/html/integration/osconsole/config.js

COPY docker/nginx.js docker/rbac.js docker/js-yaml.js /etc/nginx/conf.d/
COPY docker/nginx.conf docker/nginx-gateway.conf docker/osconsole/config.sh docker/nginx.sh docker/ACL.yaml /
COPY docker/nginx.conf docker/nginx-gateway.conf.template docker/osconsole/config.sh docker/nginx.sh docker/ACL.yaml /

COPY --from=builder /hawtio-online/docker/site /usr/share/nginx/html/
COPY --from=envsubst /usr/bin/envsubst /usr/local/bin/

USER 998

Expand Down
7 changes: 4 additions & 3 deletions docker/nginx-gateway.conf → docker/nginx-gateway.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# vim: set filetype=nginx:
js_import gateway from conf.d/nginx.js;

proxy_cache_path /var/cache/nginx/pods levels=1:2 keys_zone=pods:1m max_size=2m inactive=60m use_temp_path=off;
Expand All @@ -23,9 +24,9 @@ server {
root /usr/share/nginx/html/;

# Performance tuning
subrequest_output_buffer_size 10m;
client_body_buffer_size 256k;
proxy_buffers 16 128k;
subrequest_output_buffer_size ${NGINX_SUBREQUEST_OUTPUT_BUFFER_SIZE};
client_body_buffer_size ${NGINX_CLIENT_BODY_BUFFER_SIZE};
proxy_buffers ${NGINX_PROXY_BUFFERS};

if ($new) {
rewrite ^ $new redirect;
Expand Down
17 changes: 15 additions & 2 deletions docker/nginx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,25 @@ set -eu

./config.sh > config.js

# nginx.conf parameter default values
export NGINX_SUBREQUEST_OUTPUT_BUFFER_SIZE=${NGINX_SUBREQUEST_OUTPUT_BUFFER_SIZE:-10m}
export NGINX_CLIENT_BODY_BUFFER_SIZE=${NGINX_CLIENT_BODY_BUFFER_SIZE:-256k}
export NGINX_PROXY_BUFFERS=${NGINX_PROXY_BUFFERS:-16 128k}

generate_nginx_gateway_conf() {
envsubst '
$NGINX_SUBREQUEST_OUTPUT_BUFFER_SIZE
$NGINX_CLIENT_BODY_BUFFER_SIZE
$NGINX_PROXY_BUFFERS
' < /nginx-gateway.conf.template > /etc/nginx/conf.d/nginx.conf
}

if [ -v HAWTIO_ONLINE_RBAC_ACL ]; then
echo Using RBAC NGINX configuration
ln -sf /nginx-gateway.conf /etc/nginx/conf.d/nginx.conf
generate_nginx_gateway_conf
elif [ "${HAWTIO_ONLINE_GATEWAY:-}" = "true" ]; then
echo Using gateway NGINX configuration
ln -sf /nginx-gateway.conf /etc/nginx/conf.d/nginx.conf
generate_nginx_gateway_conf
else
echo Using legacy NGINX configuration
ln -sf /nginx.conf /etc/nginx/conf.d/nginx.conf
Expand Down