From df5452ec201a8e85b5c25c833b4dc9b70972e98e Mon Sep 17 00:00:00 2001 From: karmaking Date: Wed, 24 Jul 2024 13:30:59 +0200 Subject: [PATCH] fixed keystore paths WIP --- Dockerfile | 6 ++++-- application.properties | 4 ++-- entrypoint.sh | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 76d065f..e471440 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM openjdk:17-jdk-alpine WORKDIR / COPY target/obp-hola-app-*-SNAPSHOT.jar obp-hola.jar COPY application.properties application.properties +#COPY --chmod=777 entrypoint.sh entrypoint.sh +#RUN chmod +x entrypoint.sh EXPOSE 8087 -#ENTRYPOINT ["java","-jar","/obp-hola.jar"] -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["java","-jar","/obp-hola.jar"] +#ENTRYPOINT ["/entrypoint.sh"] diff --git a/application.properties b/application.properties index fa02fa2..ea01513 100644 --- a/application.properties +++ b/application.properties @@ -3,10 +3,10 @@ oauth2.public_url=${OAUTH_2_PUBLIC_URL} obp.base_url=${OBP_BASE_URL} endpoint.path.prefix=${ENDPOINT.PATH.PREFIX} -mtls.keyStore.path=/keystore/keystore.jks +mtls.keyStore.path=file:///keystore/keystore.jks mtls.keyStore.password=${KEYSTORE_PASSWD} mtls.keyStore.alias=${KEYSTORE_ALIAS} -mtls.trustStore.path=/truststore/truststore.jks +mtls.trustStore.path=file:///truststore/truststore.jks mtls.trustStore.password=${TRUSTSTORE_PASSWD} display_standards=${DISPLAY_STANDARDS} diff --git a/entrypoint.sh b/entrypoint.sh index e3ab939..8927918 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ +#!/bin/sh #echo $KEYSTORE_BASE64 | base64 -d > /etc/ssl/certs/keystore.jks #echo $TRUSTSTORE_BASE64 | base64 -d > /etc/ssl/certs/truststore.jks -exec java -jar /obp-hola.jar -sleep 300 \ No newline at end of file +sleep 300 +exec java -jar /obp-hola.jar \ No newline at end of file