From 57b201f37321f353fed1f629c1da1d138bd98ebb Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Tue, 24 Jun 2025 08:25:50 +0530
Subject: [PATCH 1/2] Update Dockerfile

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 artifacts/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artifacts/Dockerfile b/artifacts/Dockerfile
index 0c9572a0..ed930aff 100644
--- a/artifacts/Dockerfile
+++ b/artifacts/Dockerfile
@@ -28,8 +28,8 @@ apt-get update -y && \
 apt-get install -y --no-install-recommends unzip wget zip openjdk-11-jdk && \
 groupadd -g ${container_user_gid} ${container_user_group} &&\
 rm -rf /var/lib/apt/lists/* &&\
-wget https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz &&\
-tar -xzf apache-maven-3.8.8-bin.tar.gz && mv apache-maven-3.8.8 /usr/local/maven && rm apache-maven-3.8.8-bin.tar.gz &&\
+wget https://dlcdn.apache.org/maven/maven-3/3.8.9/binaries/apache-maven-3.8.9-bin.tar.gz &&\
+tar -xzf apache-maven-3.8.9-bin.tar.gz && mv apache-maven-3.8.9 /usr/local/maven && rm apache-maven-3.8.9-bin.tar.gz &&\
 useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user} \
 && mkdir -p /var/run/nginx /var/tmp/nginx \
 && chown -R ${container_user}:${container_user} /usr/share/nginx /var/run/nginx /var/tmp/nginx

From 7bebb85ce9993f2dd1a56bf471baab35d10fcb1f Mon Sep 17 00:00:00 2001
From: bhumi46 <thisisbn46@gmail.com>
Date: Sat, 15 Nov 2025 19:59:11 +0530
Subject: [PATCH 2/2] [MOSIP-43631] updated helm charts

Signed-off-by: bhumi46 <thisisbn46@gmail.com>
---
 artifacts/pom.xml                          |  9 +++++++++
 helm/artifactory/.gitignore                |  1 +
 helm/artifactory/templates/deployment.yaml |  1 +
 helm/artifactory/values.yaml               | 15 ++++++++++++---
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 37fb9ded..20a00cb2 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -239,6 +239,15 @@
 	</properties>
 	
 	<build>
+			<pluginManagement>
+				<plugins>
+					<plugin>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-maven-plugin</artifactId>
+						<version>3.2.3</version>
+					</plugin>
+				</plugins>
+			</pluginManagement>	
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/helm/artifactory/.gitignore b/helm/artifactory/.gitignore
index ee3892e8..1654d0dc 100644
--- a/helm/artifactory/.gitignore
+++ b/helm/artifactory/.gitignore
@@ -1 +1,2 @@
 charts/
+Chart.lock
\ No newline at end of file
diff --git a/helm/artifactory/templates/deployment.yaml b/helm/artifactory/templates/deployment.yaml
index 231540fc..983dcae7 100644
--- a/helm/artifactory/templates/deployment.yaml
+++ b/helm/artifactory/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds | default 60 }}  
       {{- if .Values.affinity }}
       affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.affinity "context" $) | nindent 8 }}
       {{- else }}
diff --git a/helm/artifactory/values.yaml b/helm/artifactory/values.yaml
index f10c61f1..32a2ea62 100644
--- a/helm/artifactory/values.yaml
+++ b/helm/artifactory/values.yaml
@@ -215,7 +215,16 @@ podAnnotations: {}
 
 ## lifecycleHooks for the  container to automate configuration before or after startup.
 ##
-lifecycleHooks: {}
+lifecycleHooks:
+  preStop:
+    exec:
+      command:
+        - sh
+        - -c
+        - sleep 30
+
+## Termination grace perios : the maximum amount of time (in seconds) Kubernetes will wait for a container to gracefully shut down
+terminationGracePeriodSeconds: 60
 
 ## Custom Liveness probes for
 ##
@@ -310,8 +319,8 @@ volumePermissions:
   enabled: false
   image:
     registry: docker.io
-    repository: bitnami/bitnami-shell
-    tag: "10"
+    repository: mosipid/os-shell
+    tag: "12-debian-12-r46"
     pullPolicy: Always
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.