Merge branch 'release/v1.21.5-8'

cloudogu · Dec 13, 2022 · 0344f03 · 0344f03
2 parents 5c09cb2 + 469a67d
commit 0344f03
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.21.5-8] - 2022-12-13
+### Added
+- Update ces-confd to 0.8.0 (#63)
+- Add possibility to disable request buffer by setting registry key `config/nginx/buffering/<doguname>` to `off` (#63)
+
 ## [v1.21.5-7] - 2022-09-20
 ### Changed
 - Update ces-confd to 0.7.0 #61
@@ -18,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [v1.21.5-5] - 2022-05-25
 ### Changed
-- Update warp-menu to v1.5.0 
+- Update warp-menu to v1.5.0
 
 ## [v1.21.5-4] - 2022-04-06
 ### Changed
@@ -104,7 +109,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SHA256 checks for all manual downloads in the dockerfile
 
 ### Changed
-- Update of the base image to v3.11.6-3 
+- Update of the base image to v3.11.6-3
 - Update warp-menu version to v1.0.4
 
 ## [v1.17.8-5] - 2020-07-20

diff --git a/Dockerfile b/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x -o errexit \
 FROM registry.cloudogu.com/official/base:3.15.3-1
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.21.5-7"
+      VERSION="1.21.5-8"
 
-ENV CES_CONFD_VERSION=0.7.0 \
-    CES_CONFD_TAR_SHA256="21568a5293208e8d806382087640418fb593bffec52587bb6669efd2ae561d41" \
+ENV CES_CONFD_VERSION=0.8.0 \
+    CES_CONFD_TAR_SHA256="365a4033e80af6953d5b6513296a828dfd772a6640533bb51dd9abd34a1e53e8" \
     WARP_MENU_VERSION=1.6.0 \
     WARP_MENU_TAR_SHA256="297c910ce2287e5322e3f447408e1ccfbc835874983dbab347b21892c74c8a5f" \
     CES_ABOUT_VERSION=0.2.2 \

diff --git a/docs/operations/proxy_buffering_de.md b/docs/operations/proxy_buffering_de.md
@@ -0,0 +1,12 @@
+# Request Buffering
+
+Wenn das Buffering aktiviert ist, erhält nginx die Antwort auf eine Seitenabfrage so schnell wie möglich und speichert diese
+in den Buffer des Nginx-Dogus, um diese dann von dort aus Stück für Stück weiter zu geben. Das verbessert die Performance für
+Nutzer mit langsamen Internetverbindungen.
+Das Buffering kann für einzelne Dogus aktiviert/deaktiviert werden. Dafür muss ein Registry-key im folgenden Format gesetzt werden:
+```
+/config/nginx/buffering/<doguname> = on|off
+```
+Ist kein Wert gesetzt, ist das Buffering immer aktiviert.
+
+Nachdem der Key in der Registry gesetzt wurde, muss nginx und das Dogu, für das der Key gesetzt wurde, neu gestartet werden.
diff --git a/docs/operations/proxy_buffering_en.md b/docs/operations/proxy_buffering_en.md
@@ -0,0 +1,12 @@
+# Request Buffering
+
+When buffering is enabled, nginx receives the response to a page request as fast as possible and stores it
+into the buffer of the nginx-dogus, to pass it on from there bit by bit. This improves performance for
+users with slow internet connections.
+Buffering can be enabled/disabled for individual dogus. To do this, a registry key must be set in the following format:
+```
+/config/nginx/buffering/<doguname> = on|off
+```
+If no value is set, buffering is always enabled.
+
+After the key is set in the registry, nginx and the dogu for which the key was set must be restarted.
diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.21.5-7",
+  "Version": "1.21.5-8",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",

diff --git a/resources/etc/ces-confd/templates/app.conf.tpl b/resources/etc/ces-confd/templates/app.conf.tpl
@@ -22,7 +22,7 @@ server {
   # https://github.com/cloudogu/ecosystem/issues/298
   # https://stackoverflow.com/questions/28347184/upstream-timed-out-110-connection-timed-out-for-static-content
   proxy_http_version 1.1;
-  
+
   # nginx.conf map handles connection_upgrade http_upgrade
   proxy_set_header Connection $connection_upgrade;
   proxy_set_header Upgrade $http_upgrade;
@@ -35,7 +35,7 @@ server {
 
   include /etc/nginx/include.d/info.conf;
   include /etc/nginx/include.d/subfilters.conf;
-  include /etc/nginx/include.d/default-dogu.conf;  
+  include /etc/nginx/include.d/default-dogu.conf;
   include /etc/nginx/include.d/customhtml.conf;
 
   # services
@@ -45,6 +45,7 @@ server {
         {{ if .Rewrite }}
         rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break;
         {{end}}
+        {{ if eq .ProxyBuffering "off" }}proxy_buffering off;{{ end }}
         proxy_pass {{.URL}};
       {{else}}
         error_page 503 /errors/starting.html;