Merge branch 'release/v1.26.1-11'

cloudogu · Sep 26, 2024 · a3b5e7f · a3b5e7f
2 parents 04f82da + 3affdc6
commit a3b5e7f
Show file tree

Hide file tree

Showing 5 changed files with 834 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.26.1-11] - 2024-09-26
+### Added
+- Animated image for dogu-starting-page
+
+### Changed
+- [#111] Use animation to show automatic reload of Dogu
+
 ## [v1.26.1-10] - 2024-09-18
 ### Changed
 - Relicense to AGPL-3.0-only

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.1-10"
+    VERSION="1.26.1-11"
 
 RUN mkdir -p ${WORKDIR}
 WORKDIR ${WORKDIR}
@@ -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.2-1
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.26.1-10"
+      VERSION="1.26.1-11"
 
 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.1-10"
+    VERSION="1.26.1-11"
 
 RUN set -x -o errexit \
  && set -o nounset \

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

diff --git a/resources/var/www/html/errors/css/errors.css b/resources/var/www/html/errors/css/errors.css
@@ -14,6 +14,7 @@
 
     /* dogu starting page */
     --ces-dogu-starting-logo: url("../img/dogu-starting.svg");
+    --ces-dogu-starting-logo-animated: url("../img/dogu-starting-animated.svg");
     --ces-dogu-starting-logo-width: var(--ces-error-logo-width);
     --ces-dogu-starting-logo-height-mobile: var(--ces-error-logo-height-mobile);
 
@@ -137,6 +138,13 @@ body {
     width: var(--ces-dogu-starting-logo-width);
     content: var(--ces-dogu-starting-logo);
 }
+/* use animated image for clients NOT prefering reduces motion */
+@media (prefers-reduced-motion: no-preference) {
+    .dogu-error.dogu-starting .logo {
+        width: var(--ces-dogu-starting-logo-width);
+        content: var(--ces-dogu-starting-logo-animated);
+    }
+}
 
 /* not found page */
 .dogu-error.not-found .logo {
@@ -192,4 +200,4 @@ body {
     .dogu-error.maintenance .logo {
         height: var(--ces-maintenance-logo-height-mobile);
     }
-}
+}