From 9c8d0996428aead8901ec7bb75018f9830554835 Mon Sep 17 00:00:00 2001 From: kameshsr <47484458+kameshsr@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:39:43 +0530 Subject: [PATCH] MOSIP-31067 Debugging with release version of auth adapter (#1162) * MOSIP-31067 Fixed dependencies verion mismatch Signed-off-by: kameshsr * MOSIP-31067 Fixed dependencies verion mismatch Signed-off-by: kameshsr * MOSIP-31067 Removed child auth filter. Signed-off-by: kameshsr * MOSIP-31067 Removed child auth filter. Signed-off-by: kameshsr --------- Signed-off-by: kameshsr --- authentication/authentication-internal-service/Dockerfile | 8 ++++---- authentication/authentication-service/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/authentication/authentication-internal-service/Dockerfile b/authentication/authentication-internal-service/Dockerfile index ea5cd5e3bc0..72793d86259 100644 --- a/authentication/authentication-internal-service/Dockerfile +++ b/authentication/authentication-internal-service/Dockerfile @@ -127,16 +127,16 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD if [ "$is_glowroot_env" = "present" ]; then \ -# wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i "s//${current_module_env}/g" glowroot/glowroot.properties ; \ - wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O https://oss.sonatype.org/service/local/repositories/releases/content/io/mosip/kernel/kernel-auth-adapter/1.2.0.1-B3/kernel-auth-adapter-1.2.0.1-B3.jar; \ java -jar -Djava.security.debug=sunpkcs11 -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ else \ -# wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${iam_adapter_url_env}" -O https://oss.sonatype.org/service/local/repositories/releases/content/io/mosip/kernel/kernel-auth-adapter/1.2.0.1-B3/kernel-auth-adapter-1.2.0.1-B3.jar; \ java -jar -Djava.security.debug=sunpkcs11 -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ fi diff --git a/authentication/authentication-service/Dockerfile b/authentication/authentication-service/Dockerfile index a34ecb41c62..71d013a6130 100644 --- a/authentication/authentication-service/Dockerfile +++ b/authentication/authentication-service/Dockerfile @@ -130,16 +130,16 @@ USER ${container_user_uid}:${container_user_gid} ENTRYPOINT [ "./configure_start.sh" ] CMD if [ "$is_glowroot_env" = "present" ]; then \ - # wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/testing/glowroot.zip ; \ unzip glowroot.zip ; \ rm -rf glowroot.zip ; \ sed -i "s//${current_module_env}/g" glowroot/glowroot.properties ; \ - wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${iam_adapter_url_env}" -O https://oss.sonatype.org/service/local/repositories/releases/content/io/mosip/kernel/kernel-auth-adapter/1.2.0.1-B3/kernel-auth-adapter-1.2.0.1-B3.jar; \ java -jar -Djava.security.debug=sunpkcs11 -javaagent:glowroot/glowroot.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ else \ - # wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ - wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \ + wget -q "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/authentication/authentication-ref-impl/authentication-childauthfilter-impl.jar -O "${loader_path_env}"/authentication-childauthfilter-impl.jar ; \ + wget -q "${iam_adapter_url_env}" -O https://oss.sonatype.org/service/local/repositories/releases/content/io/mosip/kernel/kernel-auth-adapter/1.2.0.1-B3/kernel-auth-adapter-1.2.0.1-B3.jar; \ java -jar -Djava.security.debug=sunpkcs11 -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -Dloader.path="${loader_path_env}" -Dfile.encoding="UTF-8" ${current_module_env}.jar ; \ fi