From 7bdaea3a0fccea860a6759df54dd8ef24fa0df1d Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Wed, 7 Apr 2021 09:31:27 +0200 Subject: [PATCH 1/7] #41 Remove async flag --- resources/etc/nginx/include.d/subfilters.conf.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/etc/nginx/include.d/subfilters.conf.tpl b/resources/etc/nginx/include.d/subfilters.conf.tpl index 05e3abc..77d7508 100644 --- 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 ''; +set $scripts ''; # Include google analytics scripts if a tracking id is set {{ if .Config.Exists "google_tracking_id" }} From 5c0a2c065dd3ee0bc1e14fde47c99869e9d0f323 Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Wed, 7 Apr 2021 09:33:41 +0200 Subject: [PATCH 2/7] Set correct checksum for confd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 374eb43..b1026f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ LABEL maintainer="sebastian.sdorra@cloudogu.com" \ VERSION="1.17.10-3" ENV CES_CONFD_VERSION=0.5.1 \ - CES_CONFD_TAR_SHA256="f8776bc473beeacda8ff502861906bb9ab6eeda365513290116697cc6f68eee8" \ + CES_CONFD_TAR_SHA256="819f4aed33dca6a661ad9da701d3afaceb1365c99a40ef800a6f6e201af90f4e" \ WARP_MENU_VERSION=1.0.4 \ WARP_MENU_TAR_SHA256="a5428b2adc1973724b0da93a0e67b06d2e9566c026733e20b4e39573a6148cd1" \ CES_ABOUT_VERSION=0.2.2 \ From 627d5c113eb172d4588fa7216d0a357380ad364c Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Wed, 7 Apr 2021 09:43:56 +0200 Subject: [PATCH 3/7] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79e8602..5d41ef0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## Fixed +- Remove async flag in warp-menu script tag to generate valid html +- Use correct sha256-hash for ces-confd ## [v1.17.10-3] - 2021-02-24 ## Changed From 1219a856abbbdcaf8df6b3b6eb80431c139fecce Mon Sep 17 00:00:00 2001 From: Simon Klein Date: Wed, 7 Apr 2021 12:58:12 +0200 Subject: [PATCH 4/7] Revert "Set correct checksum for confd" This reverts commit 5c0a2c06 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1026f8..374eb43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ LABEL maintainer="sebastian.sdorra@cloudogu.com" \ VERSION="1.17.10-3" ENV CES_CONFD_VERSION=0.5.1 \ - CES_CONFD_TAR_SHA256="819f4aed33dca6a661ad9da701d3afaceb1365c99a40ef800a6f6e201af90f4e" \ + CES_CONFD_TAR_SHA256="f8776bc473beeacda8ff502861906bb9ab6eeda365513290116697cc6f68eee8" \ WARP_MENU_VERSION=1.0.4 \ WARP_MENU_TAR_SHA256="a5428b2adc1973724b0da93a0e67b06d2e9566c026733e20b4e39573a6148cd1" \ CES_ABOUT_VERSION=0.2.2 \ From cb3b0d615b1579c99bab77f23dc02951ec70bd98 Mon Sep 17 00:00:00 2001 From: Joshua Sprey Date: Wed, 7 Apr 2021 14:49:41 +0200 Subject: [PATCH 5/7] bump warp menu version (#41) --- CHANGELOG.md | 3 +++ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d41ef0..00158a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove async flag in warp-menu script tag to generate valid html - Use correct sha256-hash for ces-confd +## 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 index 374eb43..98d0cf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,8 @@ LABEL maintainer="sebastian.sdorra@cloudogu.com" \ 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 \ From 778567165dd3f6469e7465799a7a451208133f1c Mon Sep 17 00:00:00 2001 From: Joshua Sprey Date: Wed, 7 Apr 2021 14:52:35 +0200 Subject: [PATCH 6/7] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98d0cf5..1bfa759 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN set -x \ FROM registry.cloudogu.com/official/base:3.10.3-2 LABEL maintainer="sebastian.sdorra@cloudogu.com" \ 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" \ diff --git a/dogu.json b/dogu.json index 665d2b0..07a435a 100644 --- 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", From 37b44847f4aa5d5f88c95b855b9e62fa88efd981 Mon Sep 17 00:00:00 2001 From: Joshua Sprey Date: Wed, 7 Apr 2021 14:52:54 +0200 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00158a1..10a4b74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [v1.17.10-4] - 2021-04-07 ## Fixed -- Remove async flag in warp-menu script tag to generate valid html -- Use correct sha256-hash for ces-confd +- Remove async flag in warp-menu script tag to generate valid html (#41) ## Changed - Upgrade warp menu to version 1.1.0 (#41)