Merge branch 'release/5.2.231309'

monday-consulting · Sep 23, 2024 · ba867b7 · ba867b7
2 parents 60e4b3d + 96222ce
commit ba867b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/inspec-tests/controls/service.rb b/inspec-tests/controls/service.rb
@@ -100,7 +100,7 @@
     its('body') { should match(input('firstspirit_version_short').to_s) }
   end
 
-  describe command(' cat /opt/firstspirit5/log/fs-server.log | grep "FirstSpirit Server Version" | sed -E \'s/.*Version ([0-9.]+)\.[0-9]+.*/\1/\'') do
+  describe command(' cat /opt/firstspirit5/log/fs-server.log | grep "FirstSpirit Server Version" | sed -E \'s/.*Version ([0-9]+\.[0-9]+\.[0-9]+)\..*/\1/\'') do
     its('stdout') { should match(input('firstspirit_version').to_s) }
   end
 end
diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
@@ -1,8 +1,8 @@
-ARG IMAGE_CREATED="2023-11-22T14:00:00CEST"
-ARG IMAGE_VERSION="5.2.231215"
-ARG IMAGE_VERSION_SHORT="2023.12"
-ARG IMAGE_VERSION_HASH="2805ad3c"
-ARG IMAGE_VERSION_INSTALL="3.0.7"
+ARG IMAGE_CREATED="2023-12-08T14:00:00CEST"
+ARG IMAGE_VERSION="5.2.231309"
+ARG IMAGE_VERSION_SHORT="2023.13"
+ARG IMAGE_VERSION_HASH="261ea62e"
+ARG IMAGE_VERSION_INSTALL="3.0.8"
 
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME