Remove expired certs and key, use them from oom.
Issue-ID: AAF-1159
Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Change-Id: I658af495ce2e30e34f94bcb57bc06c335a7b724b
diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh
index 5dead3f..9384843 100755
--- a/sms-service/bin/build_sms_image.sh
+++ b/sms-service/bin/build_sms_image.sh
@@ -33,17 +33,8 @@
cp ../target/preload .
}
-function copy_certificates {
- cp ../src/sms/certs/aaf_root_ca.cer .
- cp ../src/sms/certs/aaf-sms.pub .
- cp ../src/sms/certs/aaf-sms.pr .
-}
-
function cleanup {
rm sms preload
- rm aaf-sms.pub
- rm aaf-sms.pr
- rm aaf_root_ca.cer
}
function build_image {
@@ -66,7 +57,6 @@
}
generate_binary
-copy_certificates
build_image
push_image
cleanup
diff --git a/sms-service/bin/smsdockerfile b/sms-service/bin/smsdockerfile
index 829f89b..19f44d9 100644
--- a/sms-service/bin/smsdockerfile
+++ b/sms-service/bin/smsdockerfile
@@ -7,10 +7,8 @@
EXPOSE 10443
RUN addgroup aaf && adduser -H -D -g "" -G aaf aaf && \
mkdir -p /sms/auth && \
+ mkdir -p /sms/certs && \
chown -R aaf:aaf /sms
-ADD aaf_root_ca.cer /sms/certs/aaf_root_ca.cer
-ADD aaf-sms.pub /sms/certs/aaf-sms.pub
-ADD aaf-sms.pr /sms/certs/aaf-sms.pr
ADD sms /sms/bin/sms
RUN chmod +x /sms/bin/sms
ADD preload /sms/bin/preload