Merge branch 'release/v1.29.4-6'

Author: root

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.29.4-6] - 2026-03-12
+### Changed
+- [#143] added custom 401 and 403 error pages for admin dogu
+
 ## [v1.29.4-5] - 2026-02-17
 ### Changed 
 - [#140] Update base image to version 3.23.3-4

Dockerfile

@@ -2,7 +2,7 @@ FROM node:lts-alpine as templating
 
 ENV WORKDIR=/template \
     # Used in template to invalidate caches - do not remove. The release script will auto update this line
-    VERSION="1.29.4-5"
+    VERSION="1.29.4-6"
 
 RUN mkdir -p ${WORKDIR}
 WORKDIR ${WORKDIR}
@@ -68,11 +68,11 @@ RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloud
 FROM registry.cloudogu.com/official/base:3.23.3-4
 LABEL maintainer="hello@cloudogu.com" \
       NAME="official/nginx" \
-      VERSION="1.29.4-5"
+      VERSION="1.29.4-6"
 
 ENV CES_MAINTENANCE_MODE=false \
     # Used in template to invalidate caches - do not remove. The release script will auto update this line
-    VERSION="1.29.4-5"
+    VERSION="1.29.4-6"
 
 RUN set -x -o errexit \
  && set -o nounset \

docs/gui/release_notes_de.md

@@ -6,6 +6,10 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
 
 ## [Unreleased]
 
+## [v1.29.4-6] - 2026-03-12
+### Changed
+- Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
+
 ## [v1.29.4-5] - 2026-02-17
 ### Changed
 - Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.

docs/gui/release_notes_en.md

@@ -6,6 +6,10 @@ Technical details on a release can be found in the corresponding [Changelog](htt
 
 ## [Unreleased]
 
+## [v1.29.4-6] - 2026-03-12
+### Changed
+- We have only made technical changes. You can find more details in the changelogs.
+
 ## [v1.29.4-5] - 2026-02-17
 ### Changed
 - We have only made technical changes. You can find more details in the changelogs. 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.29.4-5",
+  "Version": "1.29.4-6",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",

resources/etc/ces-confd/templates/app.conf.tpl

@@ -5,6 +5,11 @@
             rewrite ^/{{ .Rewrite.Pattern }}(/|$)(.*) {{ .Rewrite.Rewrite }}/$2 break;
         {{end}}
         {{ if eq .ProxyBuffering "off" }}proxy_buffering off;{{ end }}
+        {{/* allow error pages redirects for admin dogu */}}
+                {{ if eq .Location "admin" }}
+                    proxy_intercept_errors on;
+                    recursive_error_pages on;
+                {{ end }}
         proxy_pass {{.URL}};
     {{else}}
         error_page 503 /errors/starting.html;

resources/etc/nginx/include.d/errors.conf

@@ -1,4 +1,6 @@
 # define custom error pages
+error_page 401 /errors/401.html;
+error_page 403 /errors/403.html;
 error_page 404 /errors/404.html;
 error_page 408 /errors/408.html;
 error_page 502 /errors/502.html;
@@ -9,3 +11,4 @@ error_page 504 /errors/504.html;
 location /errors {
 	root /var/www/html;
 }
+