Skip to content

Commit a15c15d

Browse files
sklein94cesmarvin
sklein94
authored and
cesmarvin
committed
Merge branch 'release/v1.26.1-9'
2 parents 02018ae + f2823e8 commit a15c15d

26 files changed

+1259
-223
lines changed

‎.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
theme-build/node_modules

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,5 @@ modules.xml
128128
.nfs*
129129

130130
# End of https://www.toptal.com/developers/gitignore/api/linux,go,intellij+all
131+
132+
theme-build/node_modules

‎CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [v1.26.1-9] - 2024-09-13
11+
### Changed
12+
- [#107] Redesign error-pages
13+
- Change UI language of the error-pages to german
14+
1015
## [v1.26.1-8] - 2024-09-04
1116
### Fixed
1217
- Fix problems with content security policies (CSP) caused by whitelabeling

‎Dockerfile

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
FROM node:lts-alpine as templating
2+
3+
ENV WORKDIR=/template \
4+
# Used in template to invalidate caches - do not remove. The release script will auto update this line
5+
VERSION="1.26.1-9"
6+
7+
RUN mkdir -p ${WORKDIR}
8+
WORKDIR ${WORKDIR}
9+
10+
COPY theme-build ${WORKDIR}/
11+
COPY resources ${WORKDIR}/resources
12+
13+
RUN yarn install
14+
RUN node template-colors.js ${WORKDIR}/resources/var/www/html/styles/default.css.tpl ${WORKDIR}/build/default.css
15+
RUN node template-error-pages.js ${WORKDIR}/resources/var/www/html/errors/error-page.html.tpl ${WORKDIR}/build/errors
16+
117
FROM registry.cloudogu.com/official/base:3.20.2-1 as builder
218
LABEL maintainer="[email protected]"
319

@@ -9,9 +25,7 @@ ENV NGINX_VERSION=1.26.1 \
925
WARP_MENU_VERSION=2.0.0 \
1026
WARP_MENU_TAR_SHA256="51a1010ec0f82b634999e48976d7fec98e6eb574a4401a841cd53f8cd0e14040" \
1127
CES_ABOUT_VERSION="0.5.0" \
12-
CES_ABOUT_TAR_SHA256="c4664340a248d9c2d9333a9a9df7aa9141ebeb40c051d65f78c57f2439b6f07d" \
13-
CES_THEME_VERSION=0.7.0 \
14-
CES_THEME_TAR_SHA256="d3c8ba654cdaccff8fa3202f3958ac0c61156fb25a288d6008354fae75227941"
28+
CES_ABOUT_TAR_SHA256="c4664340a248d9c2d9333a9a9df7aa9141ebeb40c051d65f78c57f2439b6f07d"
1529

1630
WORKDIR /build
1731

@@ -51,20 +65,14 @@ RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloud
5165
&& echo "${WARP_MENU_TAR_SHA256} */tmp/warp.zip" | sha256sum -c - \
5266
&& unzip /tmp/warp.zip -d /build/var/www/html
5367

54-
# install custom error pages
55-
RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/cloudogu/ces-theme/archive/v${CES_THEME_VERSION}.zip \
56-
&& echo "${CES_THEME_TAR_SHA256} */tmp/theme.zip" | sha256sum -c - \
57-
&& unzip /tmp/theme.zip -d /tmp/theme \
58-
&& cp -r /tmp/theme/ces-theme-${CES_THEME_VERSION}/dist/errors /build/var/www/html
59-
6068
FROM registry.cloudogu.com/official/base:3.20.2-1
6169
LABEL maintainer="[email protected]" \
6270
NAME="official/nginx" \
63-
VERSION="1.26.1-8"
71+
VERSION="1.26.1-9"
6472

6573
ENV CES_MAINTENANCE_MODE=false \
6674
# Used in template to invalidate caches - do not remove. The release script will auto update this line
67-
VERSION="1.26.1-8"
75+
VERSION="1.26.1-9"
6876

6977
RUN set -x -o errexit \
7078
&& set -o nounset \
@@ -81,6 +89,10 @@ COPY resources /
8189
COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
8290
COPY --from=builder /build /
8391

92+
# copy templated files
93+
COPY --from=templating /template/build/default.css /var/www/html/styles/default.css
94+
COPY --from=templating /template/build/errors /var/www/html/errors
95+
8496
# redirect logs
8597
# cannot be done via builder container as symlinks cannot get copied
8698
RUN ln -sf /dev/stdout /var/log/nginx/access.log \

‎docs/dev/ces-theme_de.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# CES-Theme-Integration
2+
3+
Im Nginx-Dogu wird das [CES-Theme-Tailwind][ces-theme-tailwind] an eingebunden um die allgemeine CES-Styles im Nginx-Dogu bereitzustellen.
4+
5+
## Templating
6+
Im Ordner [theme-build](../../theme-build) ist eine NodeJS-projekt definiert, das das [CES-Theme-Tailwind][ces-theme-tailwind] inkludiert. <!-- markdown-link-check-disable-line -->
7+
8+
### Default-Styles
9+
Die Default-Styles werden vom nginx als `default.css` in jede HTML-Seite eingebunden.
10+
Diese Styles sind in der Datei [default.css.tpl](../../resources/var/www/html/styles/default.css.tpl) definiert. <!-- markdown-link-check-disable-line -->
11+
Dabei werden die Farb-Variablen als CSS-Custom-Properties aus dem [CES-Theme-Tailwind][ces-theme-tailwind] inkludiert.
12+
13+
Mit `yarn template-default-css` wird aus der Template-Datei die `default.css` mit allen Farb-Variablen generiert.
14+
15+
16+
### Error-Pages
17+
Die Error-Pages im Nginx-Dogu sind alle gleich aufgebaut und unterscheiden sich nur durch einzelne Texte und Bilder.
18+
Aus diesem Grund gibt es auch nur ein Template für die Error-Pages: [error-page.html.tpl](../../resources/var/www/html/errors/error-page.html.tpl). <!-- markdown-link-check-disable-line -->
19+
20+
Aus diesem Template werden mit `yarn template-error-pages` die error-pages generiert.
21+
22+
Die Konfiguration der einzelnen Error-Pages ist in der Datei [error-pages.json](../../theme-build/error-pages.json) zu finden. <!-- markdown-link-check-disable-line -->
23+
24+
25+
26+
27+
[ces-theme-tailwind]: https://github.com/cloudogu/ces-theme-tailwind/

‎docs/dev/ces-theme_en.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# CES-Theme-Integration
2+
3+
The [CES-Theme-Tailwind][ces-theme-tailwind] is integrated in the Nginx-Dogu to provide the general CES styles in the Nginx-Dogu.
4+
5+
## Templating
6+
A NodeJS project is defined in the [theme-build](../../theme-build) folder, which includes the [CES-Theme-Tailwind][ces-theme-tailwind]. <!-- markdown-link-check-disable-line -->
7+
8+
### Default styles
9+
The default styles are integrated into every HTML page by nginx as `default.css`.
10+
These styles are defined in the file [default.css.tpl](../../resources/var/www/html/styles/default.css.tpl). <!-- markdown-link-check-disable-line -->
11+
The color variables are included as CSS custom properties from the [CES-Theme-Tailwind][ces-theme-tailwind].
12+
13+
With `yarn template-default-css` the `default.css` with all color variables is generated from the template file.
14+
15+
### Error pages
16+
The error pages in the Nginx-Dogu all have the same structure and only differ in individual texts and images.
17+
For this reason, there is only one template for the error pages: [error-page.html.tpl](../../resources/var/www/html/errors/error-page.html.tpl). <!-- markdown-link-check-disable-line -->
18+
19+
The error pages are generated from this template with `yarn template-error-pages`.
20+
21+
The configuration of the individual error pages can be found in the file [error-pages.json](../../theme-build/error-pages.json). <!-- markdown-link-check-disable-line -->
22+
23+
24+
25+
26+
[ces-theme-tailwind]: https://github.com/cloudogu/ces-theme-tailwind/

‎docs/gui/release_notes_de.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ 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.1-7
8+
9+
* Verbesserung der Barrierefreiheit der Fehlerseiten durch Hinzufügen des neuen Designs
10+
* Die Fehlerseiten jetzt über das Whitelabeling-Dogu whitelabelbar
11+
712
## Release 1.26.1-6
813

914
* Verbesserung der Barrierefreiheit des Warp-Menüs durch Hinzufügen des neuen Designs

‎docs/gui/release_notes_en.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ 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.1-7
8+
9+
* Improved accessibility of the error pages by adding the new design
10+
* The error pages can now be whitelabeled via the Whitelabeling-Dogu
11+
712
## Release 1.26.1-6
813

914
* Improved accessibility of the warp menu by adding the new design

‎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.1-8",
3+
"Version": "1.26.1-9",
44
"DisplayName": "Nginx",
55
"Description": "Nginx WebServer.",
66
"Logo": "https://cloudogu.com/images/dogus/nginx.png",

‎resources/etc/ces-confd/config.yaml.tpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ maintenance:
3434
source:
3535
path: /config/_global/maintenance
3636
default:
37-
title: Maintenance
38-
text: The EcoSystem is currently in maintenance mode
37+
title: Wartungsmodus
38+
text: Das EcoSystem ist aktuell nicht erreichbar - Bitte warten Sie
3939
target: /var/www/html/errors/503.html
40-
template: /etc/ces-confd/templates/maintenance.html.tpl
40+
template: /var/www/html/errors/maintenance.html.tpl
4141

‎resources/etc/ces-confd/templates/maintenance.html.tpl

-32
This file was deleted.

‎resources/var/www/html/errors/css/dogu-starting.css

-131
This file was deleted.

0 commit comments

Comments
 (0)