From 3f7c15bba860a5fee7b768d6e102e2747d0a0195 Mon Sep 17 00:00:00 2001 From: kbeyro <121854496+kbeyro@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:51:18 +0200 Subject: [PATCH] update to fit new application.properties --- Dockerfile | 3 ++- docker/run_platform.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01cef9e5e..0cb553aba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ MAINTAINER nmaas@lists.geant.org COPY --from=builder /build/build/libs/*.jar /nmaas/platform/ COPY docker/run_platform.sh /nmaas/scripts/run_platform.sh -COPY docker/nmaas-platform.properties.template /nmaas/platform/config/nmaas-platform.properties.template +# COPY docker/nmaas-platform.properties.template /nmaas/platform/config/nmaas-platform.properties.template +COPY src/main/resources/application.properties /nmaas/platform/config/application.properties COPY docker/log4j2-spring.json /nmaas/platform/config/log4j2-spring.json COPY docker/do-ntp.sh /etc/periodic/hourly/do-ntp.sh COPY docker/ssh-config /root/.ssh/config diff --git a/docker/run_platform.sh b/docker/run_platform.sh index 440f79654..d0b6dd8ff 100644 --- a/docker/run_platform.sh +++ b/docker/run_platform.sh @@ -4,9 +4,9 @@ FILE=$(ls $DIR | grep .jar) cd $DIR if [[ -z "${PLATFORM_PORT}" ]]; then - cp $DIR/config/nmaas-platform.properties.default $DIR/nmaas-platform.properties + cp $DIR/config/application.properties $DIR/nmaas-platform.properties else - envsubst < $DIR/config/nmaas-platform.properties.template > $DIR/nmaas-platform.properties + envsubst < $DIR/config/application.properties > $DIR/nmaas-platform.properties fi mkdir -p /root/.ssh -- GitLab