Skip to content

Commit 9f5f068

Browse files
MarcelTidjcesmarvin
authored andcommitted
Merge branch 'release/v1.30.0-1'
2 parents 8b298b7 + c546675 commit 9f5f068

7 files changed

Lines changed: 25 additions & 8 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ modules.xml
129129

130130
# End of https://www.toptal.com/developers/gitignore/api/linux,go,intellij+all
131131

132-
theme-build/node_modules
132+
theme-build/node_modules

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
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.30.0-1] - 2026-04-24
11+
### Changed
12+
- [#144] Upgrade nginx to v1.30.0
13+
1014
## [v1.29.4-6] - 2026-03-12
1115
### Changed
1216
- [#143] added custom 401 and 403 error pages for admin dogu

Dockerfile

Lines changed: 5 additions & 5 deletions
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.29.4-6"
5+
VERSION="1.30.0-1"
66

77
RUN mkdir -p ${WORKDIR}
88
WORKDIR ${WORKDIR}
@@ -18,8 +18,8 @@ FROM registry.cloudogu.com/official/base:3.23.3-3 as builder
1818
LABEL maintainer="hello@cloudogu.com"
1919

2020
# dockerfile is based on https://github.com/dockerfile/nginx and https://github.com/bellycard/docker-loadbalancer
21-
ENV NGINX_VERSION=1.29.4 \
22-
NGINX_TAR_SHA256="5a7d37eee505866fbab5810fa9f78247d6d5d9157a595c4e7a72043141ddab25" \
21+
ENV NGINX_VERSION=1.30.0 \
22+
NGINX_TAR_SHA256="058188c64bf22baecaa72b809a6318a4f9ba623889c554feab03f7cb853ab31b" \
2323
CES_CONFD_VERSION=0.12.0 \
2424
CES_CONFD_TAR_SHA256="fb5ddd8aab1893d92c525b906e1a027b602b51cdf58fec0aff55f72c8a729b1a" \
2525
WARP_MENU_VERSION=2.0.3 \
@@ -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.23.3-4
6969
LABEL maintainer="hello@cloudogu.com" \
7070
NAME="official/nginx" \
71-
VERSION="1.29.4-6"
71+
VERSION="1.30.0-1"
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.29.4-6"
75+
VERSION="1.30.0-1"
7676

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

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
MAKEFILES_VERSION=10.6.0
1+
MAKEFILES_VERSION=10.9.0
22

33
.DEFAULT_GOAL:=dogu-release
44

55
include build/make/variables.mk
66
include build/make/self-update.mk
77
include build/make/release.mk
8+
include build/make/clean.mk
89
include build/make/prerelease.mk
910
include build/make/version-sha.mk
1011
include build/make/trivyscan.mk

docs/gui/release_notes_de.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
66

77
## [Unreleased]
88

9+
## [v1.30.0-1] - 2026-04-24
10+
11+
## [v1.30.0-0] - 2026-04-24
12+
### Changed
13+
- Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
14+
915
## [v1.29.4-6] - 2026-03-12
1016
### Changed
1117
- Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.

docs/gui/release_notes_en.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ Technical details on a release can be found in the corresponding [Changelog](htt
66

77
## [Unreleased]
88

9+
## [v1.30.0-1] - 2026-04-24
10+
11+
## [v1.30.0-0] - 2026-04-24
12+
### Changed
13+
- We have only made technical changes. You can find more details in the changelogs.
14+
915
## [v1.29.4-6] - 2026-03-12
1016
### Changed
1117
- We have only made technical changes. You can find more details in the changelogs.

dogu.json

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

0 commit comments

Comments
 (0)