Skip to content

Commit

Permalink
Merge branch 'release/v1.26.1-4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ppxl authored and cesmarvin committed Aug 7, 2024
2 parents 8161532 + 291e06e commit 550d90a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v1.26.1-4] - 2024-08-07
### Changed
- [#98] Upgrade base-image to v3.20.2-1

### Security
- close CVE-2024-41110

## [v1.26.1-3] - 2024-08-06
### Added
- Default CSS Styles and Whitelabeling CSS Styles are being loaded now (#96)
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cloudogu.com/official/base:3.20.1-2 as builder
FROM registry.cloudogu.com/official/base:3.20.2-1 as builder
LABEL maintainer="[email protected]"

# dockerfile is based on https://github.com/dockerfile/nginx and https://github.com/bellycard/docker-loadbalancer
Expand Down Expand Up @@ -58,10 +58,10 @@ RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/clou
&& unzip /tmp/theme.zip -d /tmp/theme \
&& cp -r /tmp/theme/ces-theme-${CES_THEME_VERSION}/dist/errors /build/var/www/html

FROM registry.cloudogu.com/official/base:3.20.1-2
FROM registry.cloudogu.com/official/base:3.20.2-1
LABEL maintainer="[email protected]" \
NAME="official/nginx" \
VERSION="1.26.1-3"
VERSION="1.26.1-4"

ENV CES_MAINTENANCE_MODE=false

Expand Down
2 changes: 1 addition & 1 deletion dogu.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "official/nginx",
"Version": "1.26.1-3",
"Version": "1.26.1-4",
"DisplayName": "Nginx",
"Description": "Nginx WebServer.",
"Logo": "https://cloudogu.com/images/dogus/nginx.png",
Expand Down

0 comments on commit 550d90a

Please sign in to comment.