Merge branch 'release/v1.21.5-6'

CHANGELOG.md

@@ -7,6 +7,11 @@ 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
+
 ## [v1.21.5-5] - 2022-05-25
 ### Changed
 - Update warp-menu to v1.5.0 

Dockerfile

@@ -26,12 +26,12 @@ RUN set -x -o errexit \
 FROM registry.cloudogu.com/official/base:3.15.3-1
 LABEL maintainer="[email protected]" \
       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" \
-    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 \

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",

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"]')