From b11f8816aadc2af1cd12b284b245920de7b2e182 Mon Sep 17 00:00:00 2001
From: Philipp Wieck <philipp.wieck@monday-consulting.com>
Date: Wed, 22 Nov 2023 21:31:34 +0100
Subject: [PATCH 1/3] updated versions and image hashes

---
 jdk17/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
index 16056a4..8ab39de 100644
--- a/jdk17/Dockerfile
+++ b/jdk17/Dockerfile
@@ -1,16 +1,16 @@
-ARG IMAGE_CREATED="2023-10-27T9:00:00CEST"
-ARG IMAGE_VERSION="5.2.231107"
-ARG IMAGE_VERSION_SHORT="2023.11"
+ARG IMAGE_CREATED="2023-11-22T9:00:00CEST"
+ARG IMAGE_VERSION="5.2.231215"
+ARG IMAGE_VERSION_SHORT="2023.12"
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
 ARG FS_DOWNLOAD_SERVER_PASSWORD
 ARG FS_DOWNLOAD_SERVER_NAME="fs-isolated-server.jar"
-ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.6.tar.gz"
+ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.7.tar.gz"
 ARG FS_BASE_DIRECTORY="/opt/firstspirit5"
 ARG FS_INSTALL_DIRECTORY="/install/firstspirit5"
 ARG FS_DEBUG_PORT="*:8585"
 
-FROM docker.io/ubuntu:jammy@sha256:b492494d8e0113c4ad3fe4528a4b5ff89faa5331f7d52c5c138196f69ce176a6 AS install
+FROM docker.io/ubuntu:jammy@sha256:c9cf959fd83770dfdefd8fb42cfef0761432af36a764c077aed54bbc5bb25368 AS install
 # Reuse the global variables
 ARG IMAGE_VERSION
 ARG IMAGE_VERSION_SHORT
@@ -32,7 +32,7 @@ RUN apt-get update && apt-get install curl jq -y && \
     echo "${IMAGE_VERSION}" >> /tmp/firstspirit5/.version
 
 
-FROM docker.io/eclipse-temurin:17-jdk@sha256:4046428f68fabf1c44d49a2dc68db4af1b494005416f2f6ff557bc624fc83ec2 AS jdk
+FROM docker.io/eclipse-temurin:17-jdk@sha256:49a9414b125e2496a305baff9e0b5d9a8aded91b0df16729be5097f4555f2db5 AS jdk
 
 ENV LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE.UTF-8"

From 7b9a253e4a64503909ba02090d66b7a40b7e6a5c Mon Sep 17 00:00:00 2001
From: renezoller <30357546+renezoller@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:52:46 +0200
Subject: [PATCH 2/3] Update Dockerfile to use proper install version

---
 jdk17/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
index 3954537..34ec6fe 100644
--- a/jdk17/Dockerfile
+++ b/jdk17/Dockerfile
@@ -8,7 +8,7 @@ ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
 ARG FS_DOWNLOAD_SERVER_PASSWORD
 ARG FS_DOWNLOAD_SERVER_NAME="fs-isolated-server.jar"
-ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.5.tar.gz"
+ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.7.tar.gz"
 ARG FS_BASE_DIRECTORY="/opt/firstspirit5"
 ARG FS_INSTALL_DIRECTORY="/install/firstspirit5"
 ARG FS_DEBUG_PORT="*:8585"
@@ -112,4 +112,4 @@ ARG FS_DEBUG_PORT
 ENV FS_DEBUGPORT=${FS_DEBUG_PORT}
 
 RUN sed -i '/wrapper.java.additional.85/c\wrapper.java.additional.85=-Xdebug' ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf &&\
-    sed -i "/wrapper.java.additional.86/c\wrapper.java.additional.86=-Xrunjdwp:transport=dt_socket,address=$FS_DEBUGPORT,server=y,suspend=n" ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf
\ No newline at end of file
+    sed -i "/wrapper.java.additional.86/c\wrapper.java.additional.86=-Xrunjdwp:transport=dt_socket,address=$FS_DEBUGPORT,server=y,suspend=n" ${FS_INSTALL_DIRECTORY}/conf/fs-wrapper.isolated.conf

From 17cee3bf331d547d7d5f78f05a377dc885b906f6 Mon Sep 17 00:00:00 2001
From: renezoller <30357546+renezoller@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:27:15 +0200
Subject: [PATCH 3/3] Update service.rb

Fix the extraction of current version number from log
---
 inspec-tests/controls/service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inspec-tests/controls/service.rb b/inspec-tests/controls/service.rb
index d7a659a..4ce80a5 100644
--- 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-wrapper.log | grep "INFO: init servlet FSServlet - FirstSpirit" | sed \'s/.*FirstSpirit \([0-9]*\.[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]+.*/\1/\'') do
     its('stdout') { should match(input('firstspirit_version').to_s) }
   end
-end
\ No newline at end of file
+end