Merge branch 'release/v1.26.2-2'

cloudogu · Dec 6, 2024 · 5c28726 · 5c28726
2 parents 20df110 + b2728d3
commit 5c28726
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.26.2-2] - 2024-12-06
+### Changed
+- Update ces-about to v0.7.0 for updated license information
+
 ## [v1.26.2-1] - 2024-11-19
 - Upgrade dogu-build-lib to v2.5.0 
 - Upgrade ces-build-lib to v3.0.0

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-1"
+    VERSION="1.26.2-2"
 
 RUN mkdir -p ${WORKDIR}
 WORKDIR ${WORKDIR}
@@ -24,8 +24,8 @@ ENV NGINX_VERSION=1.26.2 \
     CES_CONFD_TAR_SHA256="8507f40824562b8d2c1f32afb43ce1aad576a82febd2f97bd2cf31b0753a8cbd" \
     WARP_MENU_VERSION=2.0.0 \
     WARP_MENU_TAR_SHA256="51a1010ec0f82b634999e48976d7fec98e6eb574a4401a841cd53f8cd0e14040" \
-    CES_ABOUT_VERSION="0.5.0" \
-    CES_ABOUT_TAR_SHA256="c4664340a248d9c2d9333a9a9df7aa9141ebeb40c051d65f78c57f2439b6f07d"
+    CES_ABOUT_VERSION="0.7.0" \
+    CES_ABOUT_TAR_SHA256="fcfdfb86dac75d5ae751cc0e8c3436ecee12f0d5ed830897c4f61029ae1df27e"
 
 WORKDIR /build
 
@@ -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.20.3-3
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.26.2-1"
+      VERSION="1.26.2-2"
 
 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-1"
+    VERSION="1.26.2-2"
 
 RUN set -x -o errexit \
  && set -o nounset \

diff --git a/docs/gui/release_notes_de.md b/docs/gui/release_notes_de.md
@@ -4,6 +4,15 @@ 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/).
 
+## Release 1.26.2-2
+- Es wird nun eine aktualisierte Liste der zugrunde liegenden Lizenzen im Warp-Menüpunkt "Über Cloudogu" angezeigt.
+
+## Release 1.26.2-1
+- nginx wurde um eine fehlerbereinigte Version aktualisiert.
+
+## Release 1.26.1-11
+- Die Dogu-Start-Seite erhält eine animierte Grafik.
+
 ## Release 1.26.1-10
 - Die Cloudogu-eigenen Quellen werden von der MIT-Lizenz auf die AGPL-3.0-only relizensiert.
 

diff --git a/docs/gui/release_notes_en.md b/docs/gui/release_notes_en.md
@@ -4,6 +4,15 @@ 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/).
 
+## Release 1.26.2-2
+- The warp menu entry "About Cloudogu" contains now an updated list of licenses.
+
+## Release 1.26.2-1
+- nginx was updated with a patch version.
+
+## Release 1.26.1-11
+- The Dogu-Starting-page shows now an animated image.
+
 ## Release 1.26.1-10
 - Relicense own code to AGPL-3.0-only
 

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