Merge branch 'release/v1.26.2-4' into develop

cloudogu · Feb 12, 2025 · 352bb74 · 352bb74
2 parents 3ebea32 + 5ca302e
commit 352bb74
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [v1.26.2-4] - 2025-02-12
 ### Added
 - Add missing container configuration keys for resource limits and requests (#117)
 

diff --git a/Dockerfile b/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.26.2-3"
+    VERSION="1.26.2-4"
 
 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.21.0-1
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.26.2-3"
+      VERSION="1.26.2-4"
 
 ENV CES_MAINTENANCE_MODE=false \
     # Used in template to invalidate caches - do not remove. The release script will auto update this line
-    VERSION="1.26.2-3"
+    VERSION="1.26.2-4"
 
 RUN set -x -o errexit \
  && set -o nounset \

diff --git a/docs/gui/release_notes_de.md b/docs/gui/release_notes_de.md
@@ -5,6 +5,8 @@ Im Folgenden finden Sie die Release Notes für das Nginx-Dogu.
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
 
 ## [Unreleased]
+
+## [v1.26.2-4] - 2025-02-12
 - Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
 
 ## [v1.26.2-3] - 2025-01-28

diff --git a/docs/gui/release_notes_en.md b/docs/gui/release_notes_en.md
@@ -5,6 +5,8 @@ Below you will find the release notes for the Nginx-Dogu.
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
 
 ## [Unreleased]
+
+## [v1.26.2-4] - 2025-02-12
 - We have only made technical changes. You can find more details in the changelogs.
 - 
 ## [v1.26.2-3] - 2025-01-28

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.26.2-3",
+  "Version": "1.26.2-4",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",