Merge branch 'release/v5.18.2-1'

cloudogu · Nov 19, 2024 · 1b1a354 · 1b1a354
2 parents adf914e + 69904a8
commit 1b1a354
Show file tree

Hide file tree

Showing 7 changed files with 495 additions and 797 deletions.
diff --git a/.trivyignore b/.trivyignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ 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]
+## [v5.18.2-1] - 2024-11-19
+- Update cypress/included:13.15.2
+- Update github.com/cloudogu/[email protected]
+- Update base image to version 3.20.3-3
+- Update swagger-ui to 5.18.2 
 
 ## [v5.17.14-1] - 2024-10-18
 - dismiss special fork from swagger-ui (#31)
@@ -60,4 +65,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [v3.25.0-1] - 2020-04-08
 ### Added
-* add Swagger UI in version 3.25.0
+* add Swagger UI in version 3.25.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,14 @@
-FROM registry.cloudogu.com/official/base:3.20.3-2 as swaggerui
-ENV SWAGGERUI_VERSION=5.17.14 \
-    SWAGGERUI_ZIP_SHA256="481244d0812097b11fbaeef79f71d942b171617f9c9f9514e63acbe13e71ccdc"
+FROM registry.cloudogu.com/official/base:3.20.3-3 as swaggerui
+ENV SWAGGERUI_VERSION=5.18.2 \
+    SWAGGERUI_ZIP_SHA256="33d0c4035a2ffb62bc5f381685d8f4606825e9e9ff0c23ddc19f44fd5af3d383"
 RUN apk update && apk add curl
 RUN curl -Lsk --fail --silent --location --retry 3 https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${SWAGGERUI_VERSION}.zip -o /tmp/swagger-ui.zip
 RUN echo "${SWAGGERUI_ZIP_SHA256} */tmp/swagger-ui.zip" | sha256sum -c -
 RUN unzip /tmp/swagger-ui.zip -d /tmp && mv /tmp/swagger-ui-${SWAGGERUI_VERSION}/dist /tmp/dist
 
-FROM registry.cloudogu.com/official/base:3.20.3-2
+FROM registry.cloudogu.com/official/base:3.20.3-3
 LABEL NAME="official/swaggerui" \
-      VERSION="5.17.14-1" \
+      VERSION="5.18.2-1" \
       maintainer="[email protected]"
 
 ENV SERVICE_TAGS=webapp \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 #!groovy
-@Library(['github.com/cloudogu/[email protected]', 'github.com/cloudogu/ces-build-lib@2.4.0']) _
+@Library(['github.com/cloudogu/[email protected]', 'github.com/cloudogu/ces-build-lib@3.0.0']) _
 import com.cloudogu.ces.dogubuildlib.*
 import com.cloudogu.ces.cesbuildlib.*
 
@@ -57,6 +57,7 @@ node('vagrant') {
             }
 
             stage('Trivy scan') {
+                sh 'mkdir -p trivy/output'
                 trivy.scanDogu("/dogu", TrivyScanFormat.HTML, params.TrivyScanLevels, params.TrivyStrategy)
                 trivy.scanDogu("/dogu", TrivyScanFormat.JSON, params.TrivyScanLevels, params.TrivyStrategy)
                 trivy.scanDogu("/dogu", TrivyScanFormat.PLAIN, params.TrivyScanLevels, params.TrivyStrategy)
@@ -76,7 +77,7 @@ node('vagrant') {
             stage('Integration Tests') {
                 echo "run integration tests."
                 ecoSystem.runCypressIntegrationTests([
-                        cypressImage     : "cypress/included:13.12.0",
+                        cypressImage     : "cypress/included:13.15.2",
                         enableVideo      : params.EnableVideoRecording,
                         enableScreenshots: params.EnableScreenshotRecording,
                 ])
@@ -195,7 +196,7 @@ node('vagrant') {
 
 def runIntegrationTests(EcoSystem ecoSystem) {
     ecoSystem.runCypressIntegrationTests([
-            cypressImage         : "cypress/included:8.3.0",
+            cypressImage         : "cypress/included:13.15.2",
             enableVideo          : params.EnableVideoRecording,
             enableScreenshots    : params.EnableScreenshotRecording
     ])

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/swaggerui",
-  "Version": "5.17.14-1",
+  "Version": "5.18.2-1",
   "DisplayName": "Swagger UI",
   "Description": "Swagger UI displays your openAPI specification.",
   "Logo": "https://github.com/cloudogu/swagger-ui/blob/master/src/img/logo_small.png?raw=true",

diff --git a/integrationTests/package.json b/integrationTests/package.json
@@ -3,12 +3,23 @@
     "@badeball/cypress-cucumber-preprocessor": "^19.2.0",
     "@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
     "@cloudogu/dogu-integration-test-library": "6.1.1",
-    "cypress": "13.12.0",
+    "cypress": "13.15.2",
     "esbuild": "^0.21.5",
+    "seedrandom": "^3.0.5", 
     "typescript": "^5.5.2"
   },
+  "resolutions": {
+    "@cypress/request": "^3.0.0",
+    "qs": "6.13.0",
+    "braces": "3.0.3",
+    "cross-spawn": "7.0.5",
+    "minimatch": "^9.0.4",
+    "semver": "^7.5.3",
+    "glob": "^9.3.2",
+    "reflect-metadata": "^0.2.2"
+  },
   "scripts": {
     "updateTests": "mkdir -p cypress/e2e/dogu_integration_test_lib && cp -r node_modules/@cloudogu/dogu-integration-test-library/lib/integration/* cypress/e2e/dogu_integration_test_lib",
     "open": "cypress open --config watchForFileChanges=false"
   }
-}
+}