Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-31067 Reverted auth adapter changes #1163

Merged
merged 9 commits into from
Jan 10, 2024
Merged

MOSIP-31067 Reverted auth adapter changes #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06a5f52
MOSIP-31067 Fixed dependencies verion mismatch
kameshsr Jan 9, 2024
7b4e48e
Merge branch 'develop' of https://github.com/mosip/id-authentication …
kameshsr Jan 9, 2024
3a5a0c6
MOSIP-31067 Fixed dependencies verion mismatch
kameshsr Jan 9, 2024
df69816
Merge branch 'develop' of https://github.com/mosip/id-authentication …
kameshsr Jan 10, 2024
40b9e6c
MOSIP-31067 Removed child auth filter.
kameshsr Jan 10, 2024
d861868
Merge branch 'develop' of https://github.com/mosip/id-authentication …
kameshsr Jan 10, 2024
0ecfe4d
MOSIP-31067 Removed child auth filter.
kameshsr Jan 10, 2024
c21c1de
Merge branch 'develop' of https://github.com/mosip/id-authentication …
kameshsr Jan 10, 2024
e4e3682
MOSIP-31067 Removed child auth filter.
kameshsr Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions authentication/authentication-internal-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \
unzip glowroot.zip ; \
rm -rf glowroot.zip ; \
sed -i "s/<service_name>/${current_module_env}/g" glowroot/glowroot.properties ; \
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; \
wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.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 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; \
wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.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

Expand Down
4 changes: 2 additions & 2 deletions authentication/authentication-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \
unzip glowroot.zip ; \
rm -rf glowroot.zip ; \
sed -i "s/<service_name>/${current_module_env}/g" glowroot/glowroot.properties ; \
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; \
wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.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 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; \
wget -q "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.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

Expand Down
Loading