From 56a620d02f2b39ce64d07007902b53544d235a59 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 26 Apr 2018 17:31:07 -0700 Subject: Adding cert files to support https Adding cert files generated by AAF CA Incorporating them into the docker build as well Issue-ID: AAF-265 Change-Id: I1ee1e031bf058a0325fe2c6fe8eed5e3948d70e7 Signed-off-by: Kiran Kamineni --- sms-service/bin/build_quorum_image.sh | 10 ++++++++-- sms-service/bin/build_sms_image.sh | 12 ++++++++++-- sms-service/bin/quorumdockerfile | 2 ++ sms-service/bin/smsdockerfile | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) (limited to 'sms-service/bin') diff --git a/sms-service/bin/build_quorum_image.sh b/sms-service/bin/build_quorum_image.sh index 4691067..b26accf 100755 --- a/sms-service/bin/build_quorum_image.sh +++ b/sms-service/bin/build_quorum_image.sh @@ -27,8 +27,13 @@ function generate_binary { cp ../target/quorumclient . } -function remove_binary { +function copy_certificates { + cp ../src/sms/auth/aaf_root_ca.cer . +} + +function cleanup { rm quorumclient + rm aaf_root_ca.cer } function build_image { @@ -51,6 +56,7 @@ function push_image { } generate_binary +copy_certificates build_image push_image -remove_binary \ No newline at end of file +cleanup \ No newline at end of file diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh index a89e64e..cd3663f 100755 --- a/sms-service/bin/build_sms_image.sh +++ b/sms-service/bin/build_sms_image.sh @@ -27,8 +27,15 @@ function generate_binary { cp ../target/sms . } -function remove_binary { +function copy_certificates { + cp ../src/sms/auth/aaf-sms.api.simpledemo.onap.org.pem . + cp ../src/sms/auth/aaf-sms.api.simpledemo.onap.org.pr . +} + +function cleanup { rm sms + rm aaf-sms.api.simpledemo.onap.org.pem + rm af-sms.api.simpledemo.onap.org.pr } function build_image { @@ -51,6 +58,7 @@ function push_image { } generate_binary +copy_certificates build_image push_image -remove_binary \ No newline at end of file +cleanup \ No newline at end of file diff --git a/sms-service/bin/quorumdockerfile b/sms-service/bin/quorumdockerfile index fa4a159..3b787d7 100644 --- a/sms-service/bin/quorumdockerfile +++ b/sms-service/bin/quorumdockerfile @@ -5,7 +5,9 @@ LABEL version=2.0.0 LABEL maintainer="Girish Havaldar " RUN mkdir -p /quorumclient/auth +ADD aaf_root_ca.cer /quorumclient/cert/aaf_root_ca.cer ADD quorumclient /quorumclient/bin/quorumclient RUN chmod +x /quorumclient/bin/quorumclient +WORKDIR /quorumclient ENTRYPOINT ["/quorumclient/bin/quorumclient"] diff --git a/sms-service/bin/smsdockerfile b/sms-service/bin/smsdockerfile index 629fcd5..50704b2 100644 --- a/sms-service/bin/smsdockerfile +++ b/sms-service/bin/smsdockerfile @@ -7,7 +7,10 @@ LABEL maintainer="vamshi krishna " EXPOSE 10443 RUN mkdir -p /sms/auth +ADD aaf-sms.api.simpledemo.onap.org.pem /sms/cert/aaf-sms.api.simpledemo.onap.org.pem +ADD aaf-sms.api.simpledemo.onap.org.pr /sms/cert/aaf-sms.api.simpledemo.onap.org.pr ADD sms /sms/bin/sms RUN chmod +x /sms/bin/sms +WORKDIR /sms ENTRYPOINT ["/sms/bin/sms"] -- cgit 1.2.3-korg