From 86ea01043add7c18cb09cba00a54d1857690068f Mon Sep 17 00:00:00 2001 From: Christoph Wolfes Date: Thu, 2 Jun 2022 20:10:30 +0200 Subject: [PATCH 1/4] update warp menu to version 1.6.0 --- CHANGELOG.md | 3 +++ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f5536..e0dfc01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Update warp-menu to v1.6.0 + ## [v1.21.5-5] - 2022-05-25 ### Changed - Update warp-menu to v1.5.0 diff --git a/Dockerfile b/Dockerfile index 26b3bf1..49160d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,8 @@ LABEL maintainer="hello@cloudogu.com" \ ENV CES_CONFD_VERSION=0.6.0 \ CES_CONFD_TAR_SHA256="069d45503149d67585e7ff15ce5cb1fe125c4cda4f69230dbf65851ccd88ad58" \ - WARP_MENU_VERSION=1.5.0 \ - WARP_MENU_TAR_SHA256="cfdd504a03aab8e5e4a33135d953b10aeba4816da5f549ddb1eb6ee593399826" \ + WARP_MENU_VERSION=1.6.0 \ + WARP_MENU_TAR_SHA256="297c910ce2287e5322e3f447408e1ccfbc835874983dbab347b21892c74c8a5f" \ CES_ABOUT_VERSION=0.2.2 \ CES_ABOUT_TAR_SHA256="9926649be62d8d4667b2e7e6d1e3a00ebec1c4bbc5b80a0e830f7be21219d496" \ CES_THEME_VERSION=v0.7.0 \ From 96a64a6d42db290fe6954495e4ba2f2f293f597f Mon Sep 17 00:00:00 2001 From: Christoph Wolfes Date: Tue, 7 Jun 2022 09:11:49 +0200 Subject: [PATCH 2/4] update integration tests --- integrationTests/cypress/support/step_definitions/then.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrationTests/cypress/support/step_definitions/then.js b/integrationTests/cypress/support/step_definitions/then.js index bd5314e..80ceb6d 100644 --- a/integrationTests/cypress/support/step_definitions/then.js +++ b/integrationTests/cypress/support/step_definitions/then.js @@ -19,7 +19,7 @@ Then("a static HTML custom page gets displayed", function () { Then(/^the warp menu category 'Support' contains a link to docs and no link to mycloudogu or the about page$/, function () { - cy.get('[id^=warpc][id$=support]').parent().children('ul').children().should('have.length', 2) + cy.get('[id^=warpc][id$=support]').parent().children('ul').children().should('have.length', 1) cy.get('*[class^=" warp-menu-shift-container"]') .children('*[class^=" warp-menu-category-list"]') From 076cfed6d6c81ead5c5ee8e570880b50c2906ad9 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 7 Jun 2022 14:22:27 +0200 Subject: [PATCH 3/4] Bump version --- Dockerfile | 2 +- dogu.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49160d7..c9da69a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN set -x -o errexit \ FROM registry.cloudogu.com/official/base:3.15.3-1 LABEL maintainer="hello@cloudogu.com" \ NAME="official/nginx" \ - VERSION="1.21.5-5" + VERSION="1.21.5-6" ENV CES_CONFD_VERSION=0.6.0 \ CES_CONFD_TAR_SHA256="069d45503149d67585e7ff15ce5cb1fe125c4cda4f69230dbf65851ccd88ad58" \ diff --git a/dogu.json b/dogu.json index bf28dcf..83ba59e 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/nginx", - "Version": "1.21.5-5", + "Version": "1.21.5-6", "DisplayName": "Nginx", "Description": "Nginx WebServer.", "Logo": "https://cloudogu.com/images/dogus/nginx.png", From f3481daf2737d6c344ea237a4472420fad27b6fd Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 7 Jun 2022 14:22:59 +0200 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0dfc01..64dfd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v1.21.5-6] - 2022-06-07 + ### Changed - Update warp-menu to v1.6.0