Skip to content

Commit 5c28726

Browse files
cloudggecesmarvin
authored andcommitted
Merge branch 'release/v1.26.2-2'
2 parents 20df110 + b2728d3 commit 5c28726

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v1.26.2-2] - 2024-12-06
11+
### Changed
12+
- Update ces-about to v0.7.0 for updated license information
13+
1014
## [v1.26.2-1] - 2024-11-19
1115
- Upgrade dogu-build-lib to v2.5.0
1216
- Upgrade ces-build-lib to v3.0.0

Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM node:lts-alpine as templating
22

33
ENV WORKDIR=/template \
44
# Used in template to invalidate caches - do not remove. The release script will auto update this line
5-
VERSION="1.26.2-1"
5+
VERSION="1.26.2-2"
66

77
RUN mkdir -p ${WORKDIR}
88
WORKDIR ${WORKDIR}
@@ -24,8 +24,8 @@ ENV NGINX_VERSION=1.26.2 \
2424
CES_CONFD_TAR_SHA256="8507f40824562b8d2c1f32afb43ce1aad576a82febd2f97bd2cf31b0753a8cbd" \
2525
WARP_MENU_VERSION=2.0.0 \
2626
WARP_MENU_TAR_SHA256="51a1010ec0f82b634999e48976d7fec98e6eb574a4401a841cd53f8cd0e14040" \
27-
CES_ABOUT_VERSION="0.5.0" \
28-
CES_ABOUT_TAR_SHA256="c4664340a248d9c2d9333a9a9df7aa9141ebeb40c051d65f78c57f2439b6f07d"
27+
CES_ABOUT_VERSION="0.7.0" \
28+
CES_ABOUT_TAR_SHA256="fcfdfb86dac75d5ae751cc0e8c3436ecee12f0d5ed830897c4f61029ae1df27e"
2929

3030
WORKDIR /build
3131

@@ -68,11 +68,11 @@ RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloud
6868
FROM registry.cloudogu.com/official/base:3.20.3-3
6969
LABEL maintainer="[email protected]" \
7070
NAME="official/nginx" \
71-
VERSION="1.26.2-1"
71+
VERSION="1.26.2-2"
7272

7373
ENV CES_MAINTENANCE_MODE=false \
7474
# Used in template to invalidate caches - do not remove. The release script will auto update this line
75-
VERSION="1.26.2-1"
75+
VERSION="1.26.2-2"
7676

7777
RUN set -x -o errexit \
7878
&& set -o nounset \

docs/gui/release_notes_de.md

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Im Folgenden finden Sie die Release Notes für das Nginx-Dogu.
44

55
Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
66

7+
## Release 1.26.2-2
8+
- Es wird nun eine aktualisierte Liste der zugrunde liegenden Lizenzen im Warp-Menüpunkt "Über Cloudogu" angezeigt.
9+
10+
## Release 1.26.2-1
11+
- nginx wurde um eine fehlerbereinigte Version aktualisiert.
12+
13+
## Release 1.26.1-11
14+
- Die Dogu-Start-Seite erhält eine animierte Grafik.
15+
716
## Release 1.26.1-10
817
- Die Cloudogu-eigenen Quellen werden von der MIT-Lizenz auf die AGPL-3.0-only relizensiert.
918

docs/gui/release_notes_en.md

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Below you will find the release notes for the Nginx-Dogu.
44

55
Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
66

7+
## Release 1.26.2-2
8+
- The warp menu entry "About Cloudogu" contains now an updated list of licenses.
9+
10+
## Release 1.26.2-1
11+
- nginx was updated with a patch version.
12+
13+
## Release 1.26.1-11
14+
- The Dogu-Starting-page shows now an animated image.
15+
716
## Release 1.26.1-10
817
- Relicense own code to AGPL-3.0-only
918

dogu.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "official/nginx",
3-
"Version": "1.26.2-1",
3+
"Version": "1.26.2-2",
44
"DisplayName": "Nginx",
55
"Description": "Nginx WebServer.",
66
"Logo": "https://cloudogu.com/images/dogus/nginx.png",

0 commit comments

Comments
 (0)