From 9dc2bf57777240d966ea625e387751e2204276a6 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:46:50 -0700 Subject: [PATCH 1/2] Bump Springboot@3.3.4 - added compilation support to native-image --- pom.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 2679bce..f48d154 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 @@ -69,11 +69,11 @@ 4.16.1 - 6.1.13 10.1.30 1.27.1 + 0.10.3 3.13.0 4.0.0.4121 0.8.12 @@ -311,12 +311,6 @@ - - org.springframework - spring-webmvc - ${spring-webmvc.version} - - org.apache.tomcat.embed tomcat-embed-core @@ -356,6 +350,11 @@ + + org.graalvm.buildtools + native-maven-plugin + ${native-image-plugin.version} + org.springframework.boot spring-boot-maven-plugin From d5bab81720a79a819eb6b34ad862e0ef29d07e9e Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:18:23 -0700 Subject: [PATCH 2/2] chore: grouped RUN cmd - updated env template --- Dockerfile | 5 ++--- docker-env/.env.template | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4245dff..fa72d06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,8 @@ FROM eclipse-temurin:21-jre-alpine AS builder ARG JAR_FILE=/usr/src/app/target/*.jar COPY --from=maven ${JAR_FILE} app.jar -RUN adduser -D user - -RUN mkdir /etc/certs \ +RUN adduser -D user \ + && mkdir /etc/certs \ && mkdir -p /data/snapshots \ && chown -R user:user /etc/certs \ && chown -R user:user /data/snapshots diff --git a/docker-env/.env.template b/docker-env/.env.template index 3e44bdc..353e5e4 100644 --- a/docker-env/.env.template +++ b/docker-env/.env.template @@ -11,7 +11,7 @@ SSL_KEY_STORE=classpath:keystore/switcherapi.p12 SSL_KEY_PASSWORD= SSL_KEY_ALIAS=switcherapi -SWITCHER_URL=https://switcherapi.com/api +SWITCHER_URL=https://api.switcherapi.com SWITCHER_KEY= SWITCHER_ENV=default SWITCHER_DOMAIN="Switcher API"