From ca255e3743daf0de6ddfafa110a7d2c1bc6f6c79 Mon Sep 17 00:00:00 2001
From: Yash S <119652212+yashmsonkusare@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:32:01 +0530
Subject: [PATCH 1/2] Update Dockerfile

---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d33600..42a2bfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11
+FROM eclipse-temurin:21-jre-alpine
 
 ARG SOURCE
 ARG COMMIT_HASH
@@ -49,16 +49,16 @@ ARG container_user=mosip
 ARG container_user_group=mosip
 
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
-ARG container_user_uid=1001
+ARG container_user_uid=1002
 
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user_gid=1001
 
 # install packages and create user
-RUN apt-get -y update \
-&& apt-get install -y unzip \
-&& groupadd -g ${container_user_gid} ${container_user_group} \
-&& useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/sh -m ${container_user}
+RUN apk -q update \
+&& apk add -q unzip wget \
+&& addgroup -g ${container_user_gid} ${container_user_group} \
+&& adduser -s /bin/sh -u ${container_user_uid} -G ${container_user_group} -h /home/${container_user} --disabled-password ${container_user}
 
 # set working directory for the user
 WORKDIR /home/${container_user}

From 5bb092d1741fbf6f9219d57f8f5ce6bb1c0ae3f2 Mon Sep 17 00:00:00 2001
From: Yash S <119652212+yashmsonkusare@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:09:44 +0530
Subject: [PATCH 2/2] Changes in the properties file regarding migration

---
 src/main/resources/application-local1.properties | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/application-local1.properties b/src/main/resources/application-local1.properties
index a1a9e28..f152b0c 100644
--- a/src/main/resources/application-local1.properties
+++ b/src/main/resources/application-local1.properties
@@ -25,11 +25,11 @@ javax.persistence.jdbc.user=postgres
 javax.persistence.jdbc.password=4YbeUrM2bD
 javax.persistence.jdbc.driver=org.postgresql.Driver
 
-hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
-hibernate.hbm2ddl.auto=none	
+hibernate.hbm2ddl.auto=none
 hibernate.show_sql=false
-hibernate.format_sql=false	
+hibernate.format_sql=false
 hibernate.connection.charSet=utf8
 hibernate.cache.use_second_level_cache=false
 hibernate.cache.use_query_cache=false
@@ -37,11 +37,11 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 mosip.digitalcard.datashare.partner.id=mpartner-default-digitalcard
 mosip.digitalcard.datashare.policy.id=mpolicy-default-digitalcard
-mosip.kernel.config.server.file.storage.uri=https://qa3.mosip.net/config/print/mz/qa3-1.1.5/
+mosip.kernel.config.server.file.storage.uri=https://raw.githubusercontent.com/mosip/mosip-config/develop/
 mosip.digitalcard.verify.credentials.flag=false
 #----------------------- CBEFF Util--------------------------------------------------
 # Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
-mosip.kernel.xsdstorage-uri=file:///media/lenovo/872da60f-3c16-4cfb-b900-0f63cbe7f3a92/opt/projects/mosip/mosip-config/sandbox/
+mosip.kernel.xsdstorage-uri=https://raw.githubusercontent.com/mosip/mosip-config/develop/
 # Cbeff XSD file name in config server
 mosip.kernel.xsdfile=mosip-cbeff.xsd
 mosip.digitalcard.print.textfile=registration-processor-print-text-file.json
@@ -95,3 +95,9 @@ mosip.kernel.auth.appid-realm-map={prereg:'mosip',ida:'mosip',registrationclient
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip',digitalcard:'mosip'}
 
 mosip.digitalcard.service.template={RPR_UIN_CARD_TEMPLATE:uin_card_template.html;vid-card-type:vid_card_template.html}
+
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
+spring.cloud.config.enabled=false
+spring.cloud.config.server.bootstrap=true
+spring.jpa.defer-datasource-initialization = true
+spring.jpa.hibernate.ddl-auto=update