Merge branch 'release/v1.7.6-2'

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.6-2] - 2025-02-12
+### Changed
+- [#238] Add missing keys to dogu.json
+- [#238] Exit on invalid logging key configuration
+
 ## [v1.7.6-1] - 2025-01-10
 ### Changed
 - [#233] Update Makefiles to 9.5.0

Dockerfile

@@ -18,7 +18,7 @@ RUN set -x \
 
 FROM registry.cloudogu.com/official/java:21.0.5-1
 LABEL NAME="official/smeagol" \
-      VERSION="1.7.6-1" \
+      VERSION="1.7.6-2" \
       maintainer="[email protected]"
 
 ENV SERVICE_TAGS=webapp \

docs/gui/release_notes_de.md

@@ -6,6 +6,10 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
 
 ## [Unreleased]
 
+## [v1.7.6-2] - 2025-02-12
+
+Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
+
 ## [v1.7.6-1] - 2025-01-10
 
 **Das Release behebt eine kritische Sicherheitslücke ([CVE-2024-56337](https://github.com/advisories/GHSA-27hp-xhwr-wr2m)). Ein Update ist daher empfohlen.**

docs/gui/release_notes_en.md

@@ -6,6 +6,11 @@ Technical details on a release can be found in the corresponding [Changelog](htt
 
 ## [Unreleased]
 
+## [v1.7.6-2] - 2025-02-12
+
+We have only made technical changes. You can find more details in the changelogs.
+
+
 ## [v1.7.6-1] - 2025-01-10
 **The release fixes a critical security vulnerability ([CVE-2024-56337](https://github.com/advisories/GHSA-27hp-xhwr-wr2m)). An update is therefore recommended.**
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/smeagol",
-  "Version": "1.7.6-1",
+  "Version": "1.7.6-2",
   "DisplayName": "Smeagol",
   "Description": "Store your technical documentation with in your git repositories",
   "Category": "Development Apps",
@@ -61,6 +61,14 @@
         "Type": "BINARY_MEASUREMENT"
       }
     },
+    {
+      "Name": "container_config/memory_request",
+      "Description": "Requests the container's minimal memory requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte). This configuration is only applicable to the Multinode-EcoSystem.",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
     {
       "Name": "container_config/swap_limit",
       "Description": "Limits the container's swap memory usage. Use zero or a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte). 0 will disable swapping.",
@@ -69,6 +77,32 @@
         "Type": "BINARY_MEASUREMENT"
       }
     },
+    {
+      "Name": "container_config/cpu_core_limit",
+      "Description": "Limits the container's CPU core usage. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU. This configuration is only applicable to the Multinode-EcoSystem.",
+      "Optional": true
+    },
+    {
+      "Name": "container_config/cpu_core_request",
+      "Description": "Requests the container's minimal CPU core requirement. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU. This configuration is only applicable to the Multinode-EcoSystem.",
+      "Optional": true
+    },
+    {
+      "Name": "container_config/storage_limit",
+      "Description": "Limits the container's ephemeral storage usage. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte). This configuration is only applicable to the Multinode-EcoSystem.",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/storage_request",
+      "Description": "Requests the container's minimal ephemeral storage requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte). This configuration is only applicable to the Multinode-EcoSystem.",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
     {
       "Name": "container_config/java_max_ram_percentage",
       "Description": "Limits the heap stack size of the Smeagol process to the configured percentage of the available physical memory when the container has more than approx. 250 MB of memory available. Is only considered when a memory_limit is set. Use a valid float value with decimals between 0 and 100 (f. ex. 55.0 for 55%). Default value for Smeagol: 25%",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smeagol",
-  "version": "1.7.6-1",
+  "version": "1.7.6-2",
   "private": true,
   "license": "AGPL-3.0-only",
   "dependencies": {

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.cloudogu.wiki</groupId>
     <artifactId>smeagol</artifactId>
-    <version>1.7.6-1</version>
+    <version>1.7.6-2</version>
     <name>smeagol</name>
     <packaging>war</packaging>
 

resources/logging.sh

@@ -9,22 +9,14 @@ DEFAULT_LOGGING_KEY="logging/root"
 SMEAGOL_LOGGING_TEMPLATE="/app/logback.xml.tpl"
 SMEAGOL_LOGGING="/app/logback.xml"
 
-function validateDoguLogLevel() {
-  echo "Validate root log level"
-
-  validateExitCode=0
-  doguctl validate "${DEFAULT_LOGGING_KEY}" || validateExitCode=$?
-
-  if [[ ${validateExitCode} -ne 0 ]]; then
-      echo "WARNING: The loglevel configured in ${DEFAULT_LOGGING_KEY} is invalid."
-      echo "WARNING: Removing misconfigured value."
-      doguctl config --rm "${DEFAULT_LOGGING_KEY}"
-  fi
-
-  return
-}
-
-validateDoguLogLevel
+echo "Validate root log level"
+validateExitCode=0
+doguctl validate "${DEFAULT_LOGGING_KEY}" || validateExitCode=$?
+
+if [[ ${validateExitCode} -ne 0 ]]; then
+    echo "ERROR: The loglevel configured in ${DEFAULT_LOGGING_KEY} is invalid. Cannot start dogu..."
+    exit 1
+fi
 
 echo "Rendering logging configuration..."
 doguctl template ${SMEAGOL_LOGGING_TEMPLATE} ${SMEAGOL_LOGGING}