From cbdfb863560aca0e8f9e41d2b543fa72af74f95d Mon Sep 17 00:00:00 2001 From: khuddus shariff Date: Wed, 17 Apr 2024 16:45:48 +0530 Subject: [PATCH] [MOSIP-32045] Removing VIRUS_SCAN ,PRINT_POSTAL_SERVICE (#1864) * [MOSIO-23045] Removing PRINT_SERVICE, VIRUS_SCAN ,PRINT_POSTAL_SERVICE Signed-off-by: khuddus shariff * [MOSIP-23045]comment sesolved. Signed-off-by: khuddus shariff * [Mosip-23045] adding delete statements to delete PRINT_POSTAL_SERVICE and VIRUS_SCAN Signed-off-by: khuddus shariff * [Mosip-23045] adding delete statements to delete PRINT_POSTAL_SERVICE and VIRUS_SCAN Signed-off-by: khuddus shariff * [MOSIP-32045] Removing VIRUS_SCAN ,PRINT_POSTAL_SERVICE Signed-off-by: khuddus shariff * [MOSIP-32045] Removing VIRUS_SCAN ,PRINT_POSTAL_SERVICE 'docker changes' Signed-off-by: khuddus shariff * [MOSIP-32045] Removing VIRUS_SCAN ,PRINT_POSTAL_SERVICE 'docker changes' Signed-off-by: khuddus shariff --------- Signed-off-by: khuddus shariff --- .../mosip_regprc/default_data_cleanup/cleanup.sql | 2 ++ .../mosip_regprc/dml/regprc-transaction_type.csv | 2 -- .../registration-processor-abis/Dockerfile | 9 +++++++++ .../Dockerfile | 10 ++++++++++ .../Dockerfile | 8 ++++++++ .../Dockerfile | 11 +++++++++++ .../registration-processor-landing-zone/Dockerfile | 8 ++++++++ .../registration-processor-reprocessor/Dockerfile | 8 ++++++++ .../Dockerfile | 8 ++++++++ 9 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 db_scripts/mosip_regprc/default_data_cleanup/cleanup.sql diff --git a/db_scripts/mosip_regprc/default_data_cleanup/cleanup.sql b/db_scripts/mosip_regprc/default_data_cleanup/cleanup.sql new file mode 100644 index 00000000000..d5d96a4da9e --- /dev/null +++ b/db_scripts/mosip_regprc/default_data_cleanup/cleanup.sql @@ -0,0 +1,2 @@ +DELETE FROM regprc.transaction_type where code ='VIRUS_SCAN'; +DELETE FROM regprc.transaction_type where code ='PRINT_POSTAL_SERVICE'; \ No newline at end of file diff --git a/db_scripts/mosip_regprc/dml/regprc-transaction_type.csv b/db_scripts/mosip_regprc/dml/regprc-transaction_type.csv index 1d55586a892..46fa79a1d9c 100644 --- a/db_scripts/mosip_regprc/dml/regprc-transaction_type.csv +++ b/db_scripts/mosip_regprc/dml/regprc-transaction_type.csv @@ -8,7 +8,6 @@ BIO,transaction_done,eng,TRUE,MOSIP_SYSTEM,now() PACKET_RECEIVER,transaction done,eng,TRUE,MOSIP_SYSTEM,now() UPLOAD_PACKET,transaction done,eng,TRUE,MOSIP_SYSTEM,now() VALIDATE_PACKET,transaction done,eng,TRUE,MOSIP_SYSTEM,now() -VIRUS_SCAN,transaction done,eng,TRUE,MOSIP_SYSTEM,now() OSI_VALIDATE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() EXTERNAL_INTEGRATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() DEMOGRAPHIC_VERIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() @@ -17,7 +16,6 @@ BIOGRAPHIC_VERIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() UIN_GENERATOR,transaction done,eng,TRUE,MOSIP_SYSTEM,now() NOTIFICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() PRINT_SERVICE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() -PRINT_POSTAL_SERVICE,transaction done,eng,TRUE,MOSIP_SYSTEM,now() QUALITY_CLASSIFIER,transaction done,eng,TRUE,MOSIP_SYSTEM,now() BIOMETRIC_AUTHENTICATION,transaction done,eng,TRUE,MOSIP_SYSTEM,now() PACKET_REPROCESS,transcation done,eng,TRUE,MOSIP_SYSTEM,now() diff --git a/registration-processor/core-processor/registration-processor-abis/Dockerfile b/registration-processor/core-processor/registration-processor-abis/Dockerfile index ee5b26edf18..cd97d92cb64 100644 --- a/registration-processor/core-processor/registration-processor-abis/Dockerfile +++ b/registration-processor/core-processor/registration-processor-abis/Dockerfile @@ -3,6 +3,15 @@ FROM openjdk:11 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image #FROM openjdk:8-jdk-alpine +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} + # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG spring_config_label diff --git a/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile b/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile index a0ded0a963d..fa9fa1f874c 100644 --- a/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile +++ b/registration-processor/init/registration-processor-dmz-packet-server/Dockerfile @@ -1,5 +1,15 @@ FROM nginx + +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} + VOLUME /home/mosip COPY nginx.conf /etc/nginx/nginx.conf diff --git a/registration-processor/init/registration-processor-registration-status-service/Dockerfile b/registration-processor/init/registration-processor-registration-status-service/Dockerfile index 6f4b8b88b67..26015819b82 100644 --- a/registration-processor/init/registration-processor-registration-status-service/Dockerfile +++ b/registration-processor/init/registration-processor-registration-status-service/Dockerfile @@ -2,6 +2,14 @@ FROM openjdk:11 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image #FROM openjdk:8-jdk-alpine +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG spring_config_label diff --git a/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile b/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile index 1d6dfc2031a..18d9125c225 100644 --- a/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile +++ b/registration-processor/post-processor/registration-processor-registration-transaction-service/Dockerfile @@ -24,6 +24,12 @@ ARG management_rmi_server_hostname # can be passed during Docker build as build time environment management rmi server port ARG management_jmxremote_rmi_port + +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME + # environment variable to pass active profile such as DEV, QA etc at docker runtime ENV active_profile_env=${active_profile} @@ -42,6 +48,11 @@ ENV artifactory_url_env=${artifactory_url} # environment variable to pass iam_adapter url, at docker runtime ENV iam_adapter_url_env=${iam_adapter_url} +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} + # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG container_user=mosip diff --git a/registration-processor/registration-processor-landing-zone/Dockerfile b/registration-processor/registration-processor-landing-zone/Dockerfile index b9e4a372aab..c772e7311ae 100644 --- a/registration-processor/registration-processor-landing-zone/Dockerfile +++ b/registration-processor/registration-processor-landing-zone/Dockerfile @@ -2,6 +2,14 @@ FROM openjdk:11 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image #FROM openjdk:8-jdk-alpine +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG spring_config_label diff --git a/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile b/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile index 2585338e371..7e09a054a1c 100644 --- a/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile +++ b/registration-processor/workflow-engine/registration-processor-reprocessor/Dockerfile @@ -2,6 +2,14 @@ FROM openjdk:11 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image #FROM openjdk:8-jdk-alpine +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG spring_config_label diff --git a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile b/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile index 869902c1ee6..aed8e7f6bdb 100644 --- a/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile +++ b/registration-processor/workflow-engine/registration-processor-workflow-manager-service/Dockerfile @@ -2,6 +2,14 @@ FROM openjdk:11 #Uncomment below and Comment above line(i.e. FROM openjdk:8) for OS specific (e.g. Alpine OS ) docker base image #FROM openjdk:8-jdk-alpine +ARG SOURCE +ARG COMMIT_HASH +ARG COMMIT_ID +ARG BUILD_TIME +LABEL source=${SOURCE} +LABEL commit_hash=${COMMIT_HASH} +LABEL commit_id=${COMMIT_ID} +LABEL build_time=${BUILD_TIME} # can be passed during Docker build as build time environment for github branch to pickup configuration from. ARG spring_config_label