From fcc1b8b2ff48286062978f387378c3d8ee3b54d7 Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Tue, 6 Jan 2026 00:26:52 +0400
Subject: [PATCH 1/5] Fix Dockerfile entrypoint formatting

---
 Dockerfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c36328f..42cf248 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,4 @@ RUN apk update \
     && apk add --no-cache ca-certificates fontconfig ttf-dejavu \
     && update-ca-certificates \
     && rm -rf /var/cache/apk/*
-ENTRYPOINT ["java",
-           "--add-opens=java.base/java.lang=ALL-UNNAMED",
-           "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
-           "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
-           "--add-opens=java.base/java.io=ALL-UNNAMED",
-           "--add-opens=java.base/java.net=ALL-UNNAMED",
-           "--add-opens=java.base/java.util=ALL-UNNAMED",
-           "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005",
-           "-Djava.security.egd=file:/dev/./urandom",
-           "-jar",
-           "/app.jar"]
+ENTRYPOINT ["java", "--add-opens=java.base/java.lang=ALL-UNNAMED", "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED", "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED", "--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.net=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.jar"]

From 3b5491e379b651c2ef736d0b4c999c55f8a3216c Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Tue, 6 Jan 2026 00:33:30 +0400
Subject: [PATCH 2/5] Add Maven toolchain configuration to Docker build

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 42cf248..0f9e192 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,8 @@ FROM maven:3.9.6-eclipse-temurin-21 as builder
 WORKDIR /workspace
 COPY .mvn ./.mvn
 COPY pom.xml .
+RUN mkdir -p /root/.m2 \
+    && echo '<toolchains>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <version>21</version>\n    </provides>\n    <configuration>\n      <jdkHome>/usr/lib/jvm/temurin-21-jdk-amd64</jdkHome>\n    </configuration>\n  </toolchain>\n</toolchains>' > /root/.m2/toolchains.xml
 COPY src ./src
 RUN mvn -B -e -DskipTests clean package
 

From 8fbad6a5ab6db75641303915afc367c837843d70 Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Tue, 6 Jan 2026 00:41:53 +0400
Subject: [PATCH 3/5] Simplify Docker build with bundled toolchain

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0f9e192..8424ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,13 @@
 FROM maven:3.9.6-eclipse-temurin-21 as builder
 WORKDIR /workspace
+
+COPY pom.xml mvnw mvnw.cmd ./
 COPY .mvn ./.mvn
-COPY pom.xml .
-RUN mkdir -p /root/.m2 \
-    && echo '<toolchains>\n  <toolchain>\n    <type>jdk</type>\n    <provides>\n      <version>21</version>\n    </provides>\n    <configuration>\n      <jdkHome>/usr/lib/jvm/temurin-21-jdk-amd64</jdkHome>\n    </configuration>\n  </toolchain>\n</toolchains>' > /root/.m2/toolchains.xml
+RUN chmod +x mvnw \
+    && ./mvnw -B -DskipTests dependency:go-offline
+
 COPY src ./src
-RUN mvn -B -e -DskipTests clean package
+RUN ./mvnw -B -DskipTests clean package
 
 FROM eclipse-temurin:21-jdk-alpine
 VOLUME /tmp

From 8d40edf634818a464d04a48349af9b0fd4d6e197 Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Tue, 6 Jan 2026 00:41:58 +0400
Subject: [PATCH 4/5] Ensure toolchain uses temurin JDK path

---
 .mvn/toolchains.xml | 2 +-
 Dockerfile          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mvn/toolchains.xml b/.mvn/toolchains.xml
index 5ce8487..3e4b686 100644
--- a/.mvn/toolchains.xml
+++ b/.mvn/toolchains.xml
@@ -6,7 +6,7 @@
       <version>21</version>
     </provides>
     <configuration>
-      <jdkHome>${env.JAVA_HOME}</jdkHome>
+      <jdkHome>/opt/java/openjdk</jdkHome>
     </configuration>
   </toolchain>
 </toolchains>
diff --git a/Dockerfile b/Dockerfile
index 8424ae0..975462d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 FROM maven:3.9.6-eclipse-temurin-21 as builder
+ENV JAVA_HOME=/opt/java/openjdk
 WORKDIR /workspace
 
 COPY pom.xml mvnw mvnw.cmd ./

From a3ff0089e161ccf848a703f90b4fa2bca62ecd4c Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Tue, 6 Jan 2026 00:47:41 +0400
Subject: [PATCH 5/5] Ensure toolchains config in Maven home

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 975462d..24fcaac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /workspace
 
 COPY pom.xml mvnw mvnw.cmd ./
 COPY .mvn ./.mvn
+RUN mkdir -p /root/.m2 \
+    && cp .mvn/toolchains.xml /root/.m2/toolchains.xml
 RUN chmod +x mvnw \
     && ./mvnw -B -DskipTests dependency:go-offline