From 7cac2e55ab8a093d94a4174f889ac9b1054c0124 Mon Sep 17 00:00:00 2001
From: Philipp Wieck <philipp.wieck@monday-consulting.com>
Date: Mon, 29 Apr 2024 13:41:30 +0200
Subject: [PATCH 1/2] fs 240509

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

diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
index 92b550a..e36a9e2 100644
--- a/jdk17/Dockerfile
+++ b/jdk17/Dockerfile
@@ -1,16 +1,16 @@
-ARG IMAGE_CREATED="2024-04-04T11:00:00CEST"
-ARG IMAGE_VERSION="5.2.240408"
-ARG IMAGE_VERSION_SHORT="2024.4"
+ARG IMAGE_CREATED="2024-04-29T12:00:00CEST"
+ARG IMAGE_VERSION="5.2.240509"
+ARG IMAGE_VERSION_SHORT="2024.5"
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
 ARG FS_DOWNLOAD_SERVER_PASSWORD
-ARG FS_DOWNLOAD_SERVER_NAME="fs-isolated-server-5.2.240408.jar"
+ARG FS_DOWNLOAD_SERVER_NAME="fs-isolated-server-5.2.240509.jar"
 ARG FS_DOWNLOAD_INSTALL_NAME="fs-install-3.0.8.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:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e AS install
+FROM docker.io/ubuntu:jammy@sha256:6d7b5d3317a71adb5e175640150e44b8b9a9401a7dd394f44840626aff9fa94d 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:05723aa44185ea767a489a3a3a531053ce968ac47545878c15b6cd3e4bab0143 AS jdk
+FROM docker.io/eclipse-temurin:17-jdk@sha256:de7b9bf508fef380ba080e88a43ac1397973a1af5cb7e21215ac5dfae3351363 AS jdk
 
 ENV LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE.UTF-8"

From ba7fc0e434df0fb0a3ba77a6599c18b27b77c8cd Mon Sep 17 00:00:00 2001
From: Philipp Wieck <philipp.wieck@monday-consulting.com>
Date: Fri, 13 Sep 2024 13:35:48 +0200
Subject: [PATCH 2/2] removed hash

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

diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
index 113ab68..102d572 100644
--- a/jdk17/Dockerfile
+++ b/jdk17/Dockerfile
@@ -1,7 +1,6 @@
 ARG IMAGE_CREATED="2024-09-13T14:00:00CEST"
 ARG IMAGE_VERSION="5.2.240509"
 ARG IMAGE_VERSION_SHORT="2024.5"
-ARG IMAGE_VERSION_HASH=""
 ARG IMAGE_VERSION_INSTALL="3.0.8"
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
@@ -17,7 +16,6 @@ FROM docker.io/ubuntu:noble@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a80386
 ARG IMAGE_VERSION
 ARG IMAGE_VERSION_INSTALL
 ARG IMAGE_VERSION_SHORT
-ARG IMAGE_VERSION_HASH
 ARG FS_DOWNLOAD_SERVER
 ARG FS_DOWNLOAD_SERVER_USERNAME
 ARG FS_DOWNLOAD_SERVER_PASSWORD
@@ -33,7 +31,7 @@ RUN apt-get update && apt-get install curl -y && \
     curl -Sf -u "${FS_DOWNLOAD_SERVER_USERNAME}:${FS_DOWNLOAD_SERVER_PASSWORD}" -o "${FS_DOWNLOAD_INSTALL_NAME}" "${FS_DOWNLOAD_SERVER}/all-mvn-release-external-e-spirit-do/de/espirit/firstspirit/fs-install/${IMAGE_VERSION_INSTALL}/fs-install-${IMAGE_VERSION_INSTALL}.tar.gz" && \
     tar zxvf /tmp/${FS_DOWNLOAD_INSTALL_NAME} -C /tmp/ && \
     rm /tmp/${FS_DOWNLOAD_INSTALL_NAME} && \
-    echo "${IMAGE_VERSION}_${IMAGE_VERSION_HASH}" >> /tmp/firstspirit5/.version
+    echo "${IMAGE_VERSION}" >> /tmp/firstspirit5/.version
 
 
 FROM docker.io/eclipse-temurin:17-noble@sha256:e65ed1ffbce778bc9d80460d49e7de1395cbb7cbd3a271d2021cc90040f98f80 AS jdk
@@ -51,7 +49,6 @@ ARG IMAGE_CREATED
 ARG IMAGE_VERSION
 ARG IMAGE_VERSION_SHORT
 ARG IMAGE_VERSION_INSTALL
-ARG IMAGE_VERSION_HASH
 ARG FS_DOWNLOAD_SERVER_NAME
 ARG FS_BASE_DIRECTORY
 ARG FS_INSTALL_DIRECTORY
@@ -64,7 +61,6 @@ ENV FS_BASEDIR="${FS_BASE_DIRECTORY}" \
     FS_INSTALLDIR="${FS_INSTALL_DIRECTORY}" \
     FS_VERSION="${IMAGE_VERSION}" \
     FS_VERSION_SHORT="${IMAGE_VERSION_SHORT}"\
-    FS_VERSION_HASH="${IMAGE_VERSION_HASH}" \
     IMAGE_VERSION_INSTALL="${IMAGE_VERSION_INSTALL}" \
     FS_JAVA_HOME=$JAVA_HOME
 
@@ -74,7 +70,7 @@ LABEL org.opencontainers.image.base.name="eclipse-temurin:17-jdk" \
     org.opencontainers.image.description="FirstSpirit in a Container" \
     org.opencontainers.image.licenses="Apache-2.0" \
     org.opencontainers.image.title="FirstSpirit" \
-    org.opencontainers.image.version=${IMAGE_VERSION}_${IMAGE_VERSION_HASH}
+    org.opencontainers.image.version=${IMAGE_VERSION}
 
 HEALTHCHECK --interval="30s" \
     --timeout="3s" \