From beee439f670ab7b4dc2b100cc9ac5975f365a7c9 Mon Sep 17 00:00:00 2001 From: David Darras Date: Thu, 10 Oct 2024 09:23:34 +0200 Subject: [PATCH 1/3] fix: resolve docker memory usage --- queen-application/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/queen-application/Dockerfile b/queen-application/Dockerfile index 2520ee17..ccc9a0b3 100644 --- a/queen-application/Dockerfile +++ b/queen-application/Dockerfile @@ -1,7 +1,11 @@ FROM eclipse-temurin:21.0.3_9-jre-alpine +ENV PATH_TO_JAR=/opt/app/app.jar WORKDIR /opt/app/ -COPY ./target/*.jar /opt/app/app.jar +COPY ./target/*.jar $PATH_TO_JAR + +ENV JAVA_TOOL_OPTIONS_DEFAULT \ + -XX:MaxRAMPercentage=75 # Setup a non-root user context (security) RUN addgroup -g 1000 tomcatgroup @@ -11,4 +15,6 @@ RUN chown -R 1000:1000 /opt/app USER 1000 -ENTRYPOINT ["java", "-jar", "/opt/app/app.jar"] +ENTRYPOINT [ "/bin/sh", "-c", \ + "export JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ + exec java -jar $PATH_TO_JAR" ] \ No newline at end of file From 529878073f7987a8ddb3bda47979061d447a37e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:26:20 +0000 Subject: [PATCH 2/3] chore(deps): update all minor dependencies --- .mvn/wrapper/maven-wrapper.properties | 2 +- pom.xml | 2 +- queen-application/Dockerfile | 2 +- queen-application/pom.xml | 8 ++++---- queen-infra-depositproof/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index b436ce1d..d00ff332 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.2 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip \ No newline at end of file +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip \ No newline at end of file diff --git a/pom.xml b/pom.xml index 37458a44..202507e4 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.4 diff --git a/queen-application/Dockerfile b/queen-application/Dockerfile index ccc9a0b3..14bf3335 100644 --- a/queen-application/Dockerfile +++ b/queen-application/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21.0.3_9-jre-alpine +FROM eclipse-temurin:21.0.4_7-jre-alpine ENV PATH_TO_JAR=/opt/app/app.jar WORKDIR /opt/app/ diff --git a/queen-application/pom.xml b/queen-application/pom.xml index e1a28230..da10d019 100644 --- a/queen-application/pom.xml +++ b/queen-application/pom.xml @@ -16,17 +16,17 @@ 2.5.1 2.0.7 2.6.0 - 2.16.1 + 2.17.0 20240303 - 33.2.1-jre - 1.5.0 + 33.3.1-jre + 1.5.2 io.zonky.test.postgres embedded-postgres-binaries-bom - 16.2.0 + 16.4.0 pom import diff --git a/queen-infra-depositproof/pom.xml b/queen-infra-depositproof/pom.xml index 61f0b9cf..27dd82ce 100644 --- a/queen-infra-depositproof/pom.xml +++ b/queen-infra-depositproof/pom.xml @@ -12,7 +12,7 @@ Deposit proof generation for Queen/Stromae - 2.9 + 2.10 12.5 From 84bc7a61ea39882e9bc798fe276ca5ad29810a24 Mon Sep 17 00:00:00 2001 From: David Darras Date: Thu, 10 Oct 2024 09:35:09 +0200 Subject: [PATCH 3/3] chore: bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 202507e4..30b5de40 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ Modules for queen back-office - 4.3.15 + 4.3.17 21 21