Merge branch 'release/v1.17.10-4'

cloudogu · Apr 7, 2021 · 872471e · 872471e
2 parents 1e73948 + 37b4484
commit 872471e
Show file tree

Hide file tree

Showing 4 changed files with 12 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.17.10-4] - 2021-04-07
+## Fixed
+- Remove async flag in warp-menu script tag to generate valid html (#41)
+
+## Changed
+- Upgrade warp menu to version 1.1.0 (#41)
+
 ## [v1.17.10-3] - 2021-02-24
 ## Changed
 - Upgrade ces-confd to version 0.5.1

diff --git a/Dockerfile b/Dockerfile
@@ -22,12 +22,12 @@ RUN set -x \
 FROM registry.cloudogu.com/official/base:3.10.3-2
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.17.10-3"
+      VERSION="1.17.10-4"
 
 ENV CES_CONFD_VERSION=0.5.1 \
     CES_CONFD_TAR_SHA256="f8776bc473beeacda8ff502861906bb9ab6eeda365513290116697cc6f68eee8" \
-    WARP_MENU_VERSION=1.0.4 \
-    WARP_MENU_TAR_SHA256="a5428b2adc1973724b0da93a0e67b06d2e9566c026733e20b4e39573a6148cd1" \
+    WARP_MENU_VERSION=1.1.0 \
+    WARP_MENU_TAR_SHA256="93c770adca28121a47c9115d7173395e7bac1562416148cb762d73a95184dfc3" \
     CES_ABOUT_VERSION=0.2.2 \
     CES_ABOUT_TAR_SHA256="9926649be62d8d4667b2e7e6d1e3a00ebec1c4bbc5b80a0e830f7be21219d496" \
     CES_THEME_VERSION=0d20c1b1d5518af475cddb33713e58ebf57f5599 \

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

diff --git a/resources/etc/nginx/include.d/subfilters.conf.tpl b/resources/etc/nginx/include.d/subfilters.conf.tpl
@@ -1,5 +1,5 @@
 # warp menu
-set $scripts '<script type="text/javascript" async="true">(function(){var s = document.createElement("script");s.type = "text/javascript";s.async = true;s.src = "/warp/warp.js";var x = document.getElementsByTagName("script")[0];x.parentNode.insertBefore(s, x);})();</script></body>';
+set $scripts '<script type="text/javascript">(function(){var s = document.createElement("script");s.type = "text/javascript";s.src = "/warp/warp.js";var x = document.getElementsByTagName("script")[0];x.parentNode.insertBefore(s, x);})();</script></body>';
 
 # Include google analytics scripts if a tracking id is set
 {{ if .Config.Exists "google_tracking_id" }}