From 2c215f8b0d855e4db436b4b05191680dfa7274be Mon Sep 17 00:00:00 2001
From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
Date: Tue, 13 Aug 2024 13:40:11 +0530
Subject: [PATCH 1/4] [DSD-3532] Updated Dockerfile

Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
---
 biosdk-services/Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/biosdk-services/Dockerfile b/biosdk-services/Dockerfile
index b214bff..60e55a4 100644
--- a/biosdk-services/Dockerfile
+++ b/biosdk-services/Dockerfile
@@ -19,12 +19,22 @@ ARG active_profile
 # can be passed during Docker build as build time environment for config server URL
 ARG spring_config_url
 
+# can be passed during Docker build as build time environment for config server name
+ARG spring_cloud_config_name=application,biosdk-service
+
+# can be passed during Docker build as build time environment for spring application name
+ARG spring_application_name=biosdk-service
+
 # environment variable to pass github branch to pickup configuration from, at docker runtime
 ENV spring_config_label_env=${spring_config_label}
 # environment variable to pass active profile such as DEV, QA etc at docker runtime
 ENV active_profile_env=${active_profile}
 # environment variable to pass spring configuration url, at docker runtime
 ENV spring_config_url_env=${spring_config_url}
+# environment variable to pass spring config server name, at docker runtime
+ENV spring_cloud_config_name_env=${spring_cloud_config_name}
+# environment variable to pass spring application name, at docker runtime
+ENV spring_application_name_env=${spring_application_name}
 
 ARG biosdk_zip_url
 
@@ -93,4 +103,4 @@ EXPOSE 9099
 ENTRYPOINT ["./configure_biosdk.sh"]
 
 CMD echo $biosdk_bioapi_impl ; \
-java -Dloader.path="${loader_path_env}" -Dserver.servlet.context-path="${service_context_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" --add-modules=ALL-SYSTEM --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect.DirectMethodHandleAccessor=ALL-UNNAMED -jar biosdk-services.jar
\ No newline at end of file
+java -Dloader.path="${loader_path_env}" -Dserver.servlet.context-path="${service_context_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" -Dspring.application.name="${spring_application_name_env}" -Dspring.cloud.config.name="${spring_cloud_config_name_env}" --add-modules=ALL-SYSTEM --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect.DirectMethodHandleAccessor=ALL-UNNAMED -jar biosdk-services.jar

From 1b595a147b842fca63fead043e67d8008797c3c0 Mon Sep 17 00:00:00 2001
From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
Date: Tue, 13 Aug 2024 13:41:54 +0530
Subject: [PATCH 2/4] [DSD-3532] Updated values.yaml

Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
---
 helm/biosdk-service/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/biosdk-service/values.yaml b/helm/biosdk-service/values.yaml
index 6282bed..b8fe81c 100644
--- a/helm/biosdk-service/values.yaml
+++ b/helm/biosdk-service/values.yaml
@@ -241,7 +241,7 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars:
-  - name: server_servlet_context_env
+  - name: service_context_env
     value: /biosdk-service
   - name: spring_application_name_env
     value: biosdk-service

From 5340d2326fc5473c696bdb012eddd28170c46bff Mon Sep 17 00:00:00 2001
From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:40:11 +0530
Subject: [PATCH 3/4] [DSD-3532] Updated Dockerfile

Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
---
 biosdk-services/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biosdk-services/Dockerfile b/biosdk-services/Dockerfile
index 60e55a4..b404c7e 100644
--- a/biosdk-services/Dockerfile
+++ b/biosdk-services/Dockerfile
@@ -46,9 +46,9 @@ ENV biosdk_local_dir_name=${biosdk_local_dir}
 
 ARG sdk_impl
 
-ARG service_context=/biosdk-service
+ARG server_servlet_context_path=/biosdk-service
 
-ENV service_context_env=${service_context}
+ENV server_servlet_context_path_env=${server_servlet_context_path}
 
 #ENV biosdk_zip_url=$biosdk_zip_url
 ENV biosdk_bioapi_impl=${sdk_impl}
@@ -103,4 +103,4 @@ EXPOSE 9099
 ENTRYPOINT ["./configure_biosdk.sh"]
 
 CMD echo $biosdk_bioapi_impl ; \
-java -Dloader.path="${loader_path_env}" -Dserver.servlet.context-path="${service_context_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" -Dspring.application.name="${spring_application_name_env}" -Dspring.cloud.config.name="${spring_cloud_config_name_env}" --add-modules=ALL-SYSTEM --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect.DirectMethodHandleAccessor=ALL-UNNAMED -jar biosdk-services.jar
+java -Dloader.path="${loader_path_env}" -Dserver.servlet.context-path="${server_servlet_context_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}"  -Dspring.cloud.config.uri="${spring_config_url_env}" -Dspring.application.name="${spring_application_name_env}" -Dspring.cloud.config.name="${spring_cloud_config_name_env}" --add-modules=ALL-SYSTEM --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.lang.stream=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.time.LocalDate=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime=ALL-UNNAMED --add-opens java.base/java.time.LocalDateTime.date=ALL-UNNAMED --add-opens java.base/jdk.internal.reflect.DirectMethodHandleAccessor=ALL-UNNAMED -jar biosdk-services.jar

From d606f17b167845a93cb24798a204f90ba3207e23 Mon Sep 17 00:00:00 2001
From: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:41:19 +0530
Subject: [PATCH 4/4] [DSD-3532] Updated values.yaml

Signed-off-by: Rakshith B <79500257+Rakshithb1@users.noreply.github.com>
---
 helm/biosdk-service/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/biosdk-service/values.yaml b/helm/biosdk-service/values.yaml
index b8fe81c..b438e56 100644
--- a/helm/biosdk-service/values.yaml
+++ b/helm/biosdk-service/values.yaml
@@ -241,7 +241,7 @@ updateStrategy:
 ##     value: "bar"
 ##
 extraEnvVars:
-  - name: service_context_env
+  - name: server_servlet_context_path_env
     value: /biosdk-service
   - name: spring_application_name_env
     value: biosdk-service