Docker build fix [MOSIP-44274]

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.9.15/binaries/apache-maven-3.9.15-bin.tar.gz &&\
+tar -xzf apache-maven-3.9.15-bin.tar.gz && mv apache-maven-3.9.15 /usr/local/maven && rm apache-maven-3.9.15-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
@@ -51,17 +51,12 @@ ENV base_path=/usr/share/nginx/html/artifactory
 # environment variable for Biosdk client Zip path
 ENV biosdk_client_zip_path=${base_path}/libs-release-local/biosdk/mock/0.9
 
-# environment variable for Biosdk client Zip path
-ENV biosdk_client_zip_java21_path=${base_path}/libs-release-local/biosdk/mock/0.9/java21
-
 # environment variable for Demosdk Zip path
 ENV demosdk_zip_path=${base_path}/libs-release-local/demosdk/default/
 
 # environment variable for Biosdk lib Zip path
 ENV biosdk_lib_zip_path=${base_path}/libs-release-local/biosdk/
 
-ENV biosdk_lib_zip_java21_path=${base_path}/libs-release-local/biosdk/java21/
-
 # environment variable for Biosdk lib Zip path
 ENV jpegsdk_lib_zip_path=${base_path}/libs-release-local/jpeg-sdk/
 
@@ -80,9 +75,6 @@ ENV mosip_plugins_zip_path=${base_path}/libs-release-local/mosip-plugins
 # environment valiable for sdk jar
 ENV sdk_path=${base_path}/libs-release-local/mock-sdk/1.1.5/
 
-# environment valiable for sdk jar
-ENV jpeg_sdk_path=${base_path}/libs-release-local/jpeg-mock-sdk/1.1.5/
-
 # environment valiable for image-compressor jar
 ENV image_compressor_path=${base_path}/libs-release-local/compressor/
 
@@ -113,12 +105,12 @@ ENV image_zip_path=${base_path}/libs-release-local/image
 # environment variable for idp auth wrapper zip path
 ENV idp_auth_wrapper_lib_zip_path=${base_path}/libs-release-local/idp/idp-auth-wrapper
 
+# environment variable for certify plugins zip path
+ENV certify_plugin_zip_path=${base_path}/libs-release-local/certify
+
 # environment variable for esignet wrappers zip path
 ENV esignet_wrapper_lib_zip_path=${base_path}/libs-release-local/esignet
 
-#environment variable for certify plugins zip path
-ENV certify_plugin_zip_path=${base_path}/libs-release-local/certify
-
 # environment variable for Clamav dependency
 ENV clamav_path=${base_path}/libs-release-local/clamav
 
@@ -129,9 +121,6 @@ ENV regclient_jar_path=${base_path}/libs-release-local
 
 ENV master_template_path=${base_path}/libs-release-local/master-templates
 
-# environment variable
-ENV pdf_generator_path=${base_path}/libs-release-local/pdf-generator
-
 # environment variable for child auth filter jar path
 ENV child_auth_filter_jar_path=${base_path}/libs-release-local/io/mosip/authentication/authentication-ref-impl
 
@@ -142,26 +131,22 @@ ENV scripts_path=/home/mosip/scripts
 ENV version=1.2.1-SNAPSHOT
 ENV idp_auth_wrapper_version=0.0.1-SNAPSHOT
 
+#environment variable for pdf generator
+ENV pdf_generator_path=${base_path}/libs-release-local/pdf-generator
+
 # Create all the jar, i18n & theme paths.
-RUN mkdir -p ${biosdk_client_zip_java21_path}/biosdk-client/ ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${biosdk_lib_zip_java21_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${mosip_plugins_zip_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${regproc_jar_path} ${sdk_path} ${image_compressor_path}/image-compressor ${icu4j_jar_path} ${icu4j_jar_path}/java21 ${clamav_path} ${i18n_zip_path} ${theme_zip_path} ${image_zip_path} ${child_auth_filter_jar_path} ${base_path}/libs-release-local/reg-client ${scripts_path} ${master_template_path} ${pdf_generator_path} ${jpeg_sdk_path} ${jpegsdk_lib_zip_path}/jpeg-sdk-lib/ ${idp_auth_wrapper_lib_zip_path} ${esignet_wrapper_lib_zip_path}/esignet-wrapper ${certify_plugin_zip_path}/certify-plugin ${registration_api_impl_zip_path}/registration-api-impl ${esignet_wrapper_lib_zip_path}/esignet-plugins
+RUN mkdir -p ${biosdk_client_zip_path}/biosdk-client ${demosdk_zip_path}/demosdk ${biosdk_lib_zip_path}/biosdk-lib ${cache_path} ${ida_sh_path} ${hsm_client_path} ${mosip_plugins_zip_path} ${kernel_jar_path} ${test_jar_path} ${idobject_jar_path} ${regproc_jar_path} ${sdk_path} ${image_compressor_path}/image-compressor ${icu4j_jar_path} ${clamav_path} ${i18n_zip_path} ${theme_zip_path} ${image_zip_path} ${child_auth_filter_jar_path} ${base_path}/libs-release-local/reg-client ${scripts_path} ${master_template_path} ${pdf_generator_path} ${idp_auth_wrapper_lib_zip_path} ${esignet_wrapper_lib_zip_path}/esignet-wrapper ${certify_plugin_zip_path}/certify-plugin ${registration_api_impl_zip_path}/registration-api-impl
+
 # Copy all the respective jars to the location
 
 COPY /src/sdk/biosdk/install.sh ${biosdk_client_zip_path}/biosdk-client/
 
-COPY /src/sdk/biosdk/install.sh ${biosdk_client_zip_java21_path}/biosdk-client/
-
 COPY /src/sdk/demosdk/install.sh ${demosdk_zip_path}/demosdk/
 
 COPY /src/deployment/docker/id-authentication/* ${ida_sh_path}/
 
 COPY /src/hsm/client.zip ${hsm_client_path}/
 
-COPY /src/hsm/client-alpine.zip ${hsm_client_path}/
-
-COPY /src/hsm/client-ubuntu.zip ${hsm_client_path}/
-
-COPY /src/hsm/client-21.zip ${hsm_client_path}/
-
 COPY /src/mosip-plugins/sign-in-with-esignet/sign-in-with-esignet.zip ${mosip_plugins_zip_path}/
 
 COPY /src/testing/regproc-reprocessor-ceylon-cache-repo.zip ${test_jar_path}/
@@ -174,8 +159,6 @@ COPY /src/i18n/admin-entity-spec-bundle/*  ${work_dir}/admin-entity-spec-bundle/
 
 COPY /src/i18n/admin-i18n-bundle/*  ${work_dir}/admin-i18n-bundle/
 
-COPY /src/i18n/resident-i18n-bundle/*  ${work_dir}/resident-i18n-bundle/
-
 COPY /src/i18n/pmp-entity-spec-bundle/*  ${work_dir}/pmp-entity-spec-bundle/
 
 COPY /src/i18n/pmp-i18n-bundle/*  ${work_dir}/pmp-i18n-bundle/
@@ -184,10 +167,6 @@ COPY /src/i18n/pre-registration-i18n-bundle/*  ${work_dir}/pre-registration-i18n
 
 COPY /src/master-templates/* ${work_dir}/master-templates/
 
-COPY /src/pdf-generator/* ${work_dir}/pdf-generator/
-
-COPY /src/i18n/idp-i18n-bundle/*  ${work_dir}/idp-i18n-bundle/
-
 COPY /src/i18n/oidc-demo-i18n-bundle/*  ${work_dir}/oidc-demo-i18n-bundle/
 
 COPY /src/i18n/mock-relying-party-i18n-bundle/*  ${work_dir}/mock-relying-party-i18n-bundle/
@@ -208,6 +187,9 @@ COPY /src/jre/* ${regclient_jar_path}/
 
 COPY /src/icu4j/* ${icu4j_jar_path}/
 
+COPY /src/pdf-generator/* ${work_dir}/pdf-generator/
+
+
 COPY /src/auth/* ${regproc_jar_path}/
 
 COPY ./configure.sh ${work_dir}/

artifacts/configure.sh

@@ -5,8 +5,8 @@ set -e
 # This scripts performs multiple commands to set up the libraries inside the artifactory server docker.
 # Activies performed are listed as below
 # 1. biosdk-client zip creation
-# 2. jpeg-sdk-lib zip creation
-# 3. biosdk-lib zip ceation
+# 2. biosdk-lib zip creation
+# 3. image-compressor zip ceation
 # 4. demosdk-lib zip creation
 # 5. Create resources zip for reg-client
 # 6. Create i18n and entity-spec bundles zip files for all the required modules
@@ -17,26 +17,11 @@ zip -r -j ${biosdk_client_zip_path}/biosdk-client.zip ${biosdk_client_zip_path}/
 rm -rf ${biosdk_client_zip_path}/biosdk-client
 echo biosdk client zip creation completed
 
-echo biosdk client zip java21 creation started
-zip -r -j ${biosdk_client_zip_java21_path}/biosdk-client.zip ${biosdk_client_zip_java21_path}/biosdk-client/*
-rm -rf ${biosdk_client_zip_java21_path}/biosdk-client
-echo biosdk client zip creation completed
-
-echo jpeg-sdk-lib zip creation started
-zip -r -j ${jpegsdk_lib_zip_path}/jpeg-sdk-lib.zip ${jpegsdk_lib_zip_path}/jpeg-sdk-lib/*
-rm -rf ${jpegsdk_lib_zip_path}/jpeg-sdk-lib
-echo jpeg-sdk-lib zip creation completed
-
 echo biosdk-lib zip creation started
 zip -r -j ${biosdk_lib_zip_path}/biosdk-lib.zip ${biosdk_lib_zip_path}/biosdk-lib/*
 rm -rf ${biosdk_lib_zip_path}/biosdk-lib
 echo biosdk-lib zip creation completed
 
-echo biosdk-lib java21 zip creation started
-zip -r -j ${biosdk_lib_zip_java21_path}/biosdk-lib.zip ${biosdk_lib_zip_java21_path}/biosdk-lib/*
-rm -rf ${biosdk_lib_zip_java21_path}/biosdk-lib
-echo biosdk-lib zip creation completed
-
 echo image-compressor zip creation started
 zip -r -j ${image_compressor_path}/image-compressor.zip ${image_compressor_path}/image-compressor/*
 rm -rf ${image_compressor_path}/image-compressor
@@ -57,11 +42,6 @@ zip -r -j ${certify_plugin_zip_path}/certify-plugin.zip ${certify_plugin_zip_pat
 rm -rf ${certify_plugin_zip_path}/certify-plugin
 echo certify-plugin zip creation completed
 
-echo esignet-plugins zip creation started
-zip -r -j ${esignet_wrapper_lib_zip_path}/esignet-plugins.zip ${esignet_wrapper_lib_zip_path}/esignet-plugins/*
-rm -rf ${esignet_wrapper_lib_zip_path}/esignet-plugins
-echo esignet-plugins zip creation completed
-
 echo Creating resources.zip file for all the resources provided
 zip -r -j ${base_path}/libs-release-local/reg-client/resources.zip ${work_dir}/resources
 rm -rf ${work_dir}/resources
@@ -74,20 +54,17 @@ rm -rf ${work_dir}/admin-entity-spec-bundle ${work_dir}/pmp-entity-spec-bundle
 echo spec-bundle zip creation completed
 
 echo i18n-bundles zip creation for all the mentioned modules started
-zip -r -j ${i18n_zip_path}/admin-i18n-bundle.zip ${work_dir}/admin-i18n-bundle/* 
+zip -r -j ${i18n_zip_path}/admin-i18n-bundle.zip ${work_dir}/admin-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/pmp-i18n-bundle.zip ${work_dir}/pmp-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/pre-registration-i18n-bundle.zip ${work_dir}/pre-registration-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/oidc-demo-i18n-bundle.zip ${work_dir}/oidc-demo-i18n-bundle/*
-zip -r -j ${i18n_zip_path}/idp-i18n-bundle.zip ${work_dir}/idp-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/mock-relying-party-i18n-bundle.zip ${work_dir}/mock-relying-party-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/esignet-i18n-bundle.zip ${work_dir}/esignet-i18n-bundle/*
-zip -r -j ${i18n_zip_path}/resident-i18n-bundle.zip ${work_dir}/resident-i18n-bundle/*
 zip -r -j ${i18n_zip_path}/esignet-signup-i18n-bundle.zip ${work_dir}/esignet-signup-i18n-bundle/*
 rm -rf ${work_dir}/admin-i18n-bundle \
  ${work_dir}/pmp-i18n-bundle \
  ${work_dir}/pre-registration-i18n-bundle \
  ${work_dir}/oidc-demo-i18n-bundle \
- ${work_dir}/idp-i18n-bundle \
  ${work_dir}/mock-relying-party-i18n-bundle \
  ${work_dir}/esignet-i18n-bundle \
  ${work_dir}/resident-i18n-bundle \