Merge pull request #6 from docksal/develop

Release 1.1.0

bin/docker-entrypoint.sh

@@ -11,7 +11,6 @@ echo_debug ()
 	if [[ "$DEBUG" != 0 ]]; then echo -e "$(date +"%F %H:%M:%S") | $@"; fi
 }
 
-
 # Execute available init scripts
 # This can be used by child images to run additional provisioning scripts at startup
 ls /etc/docker-entrypoint.d/ > /dev/null

bin/docker-healthcheck.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
+# Fail if any of the healthchecks failed
+set -e
+
 # Verify nginx config is valid
 nginx -t
 
-# Verify default vhost it up
-wget -qSO- http://127.0.0.1/.healthz
+# Check if nginx started and listening tcp port
+netstat -nlp | grep -E 'tcp.*LISTEN.*nginx' >/dev/null || exit 1

conf/includes/defaults.conf.tmpl

@@ -1,7 +1,2 @@
 # Shared default virtual host settings go here
 
-# /.healthz location for status checks
-location ~ ^/\.healthz$ {
-    access_log off;
-    return 204;
-}

conf/nginx.conf.tmpl

@@ -19,8 +19,31 @@ http {
 
     access_log  /var/log/nginx/access.log  main;
 
-    sendfile        on;
-    keepalive_timeout  65;
+    proxy_connect_timeout 60;
+    proxy_send_timeout 600;
+    proxy_read_timeout 600;
+    proxy_intercept_errors on;
+    proxy_cache off;
+    proxy_request_buffering off;
+    proxy_buffering off;
+    proxy_buffers 16 32k;
+    proxy_buffer_size 32k;
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+
+    client_max_body_size 1G;
+    http2_max_field_size 8k;
+
+    port_in_redirect off;
+    send_timeout 600;
+    sendfile on;
+    keepalive_requests 100;
+    keepalive_timeout 60;
+    reset_timedout_connection off;
+    server_tokens off;
+
+    server_names_hash_bucket_size 128;
+    server_names_hash_max_size 20480;
 
     include /etc/nginx/conf.d/*.conf;
 }