From 0ed3c0ba06c71adfb0c4b47a8f03955b9fa9c248 Mon Sep 17 00:00:00 2001 From: kameshsr Date: Thu, 16 May 2024 18:18:52 +0530 Subject: [PATCH] MOSIP-32842 Updated docker file Signed-off-by: kameshsr --- partner/partner-management-service/Dockerfile | 12 ++++++------ .../src/main/resources/application-dev.properties | 2 +- partner/policy-management-service/Dockerfile | 12 ++++++------ .../src/main/resources/application-dev.properties | 2 +- .../io/mosip/pms/policy/test/PolicyServiceTest.java | 4 +++- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/partner/partner-management-service/Dockerfile b/partner/partner-management-service/Dockerfile index 16a366f1dd..8b86cdd98b 100644 --- a/partner/partner-management-service/Dockerfile +++ b/partner/partner-management-service/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM eclipse-temurin:21-jre-alpine ARG SOURCE ARG COMMIT_HASH @@ -45,16 +45,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} diff --git a/partner/partner-management-service/src/main/resources/application-dev.properties b/partner/partner-management-service/src/main/resources/application-dev.properties index 5ff4cb236e..b4d27eb1f4 100644 --- a/partner/partner-management-service/src/main/resources/application-dev.properties +++ b/partner/partner-management-service/src/main/resources/application-dev.properties @@ -6,7 +6,7 @@ javax.persistence.jdbc.url = jdbc:postgresql://dev.mosip.net:5432/mosip_pms javax.persistence.jdbc.password = mosip123 javax.persistence.jdbc.user = postgres javax.persistence.jdbc.schema = pms -hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect hibernate.jdbc.lob.non_contextual_creation=true hibernate.hbm2ddl.auto=none diff --git a/partner/policy-management-service/Dockerfile b/partner/policy-management-service/Dockerfile index 52e50f2df8..ba53a57f51 100644 --- a/partner/policy-management-service/Dockerfile +++ b/partner/policy-management-service/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11 +FROM eclipse-temurin:21-jre-alpine ARG SOURCE ARG COMMIT_HASH @@ -42,16 +42,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} diff --git a/partner/policy-management-service/src/main/resources/application-dev.properties b/partner/policy-management-service/src/main/resources/application-dev.properties index 2fb666cde3..93ff11aa49 100644 --- a/partner/policy-management-service/src/main/resources/application-dev.properties +++ b/partner/policy-management-service/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ javax.persistence.jdbc.url = jdbc:postgresql://localhost:30090/mosip_pms javax.persistence.jdbc.password = mosip123 javax.persistence.jdbc.user = postgres javax.persistence.jdbc.schema = pms -hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect pmp.policy.allowed.authtokens.types=random,partner,policy pmp.policy.expiry.period.indays = 180 diff --git a/partner/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java b/partner/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java index a7ad4cfe78..68f84389ba 100644 --- a/partner/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java +++ b/partner/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java @@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Import; import io.mosip.pms.common.helper.FilterHelper; @@ -19,7 +20,8 @@ * */ @Import(value = {WebSubPublisher.class,RestUtil.class,SearchHelper.class,FilterHelper.class,PageUtils.class,FilterColumnValidator.class,RestUtil.class}) -@SpringBootApplication(scanBasePackages = { "io.mosip.pms.policy.*","io.mosip.pms.common.*"}) +@SpringBootApplication(scanBasePackages = { "io.mosip.pms.policy.*","io.mosip.pms.common.*"}, + exclude={DataSourceAutoConfiguration.class}) public class PolicyServiceTest { /**