From cb017456dbe09fc8f3e5270e641ab8f323ecde76 Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Mon, 17 Sep 2018 16:21:53 -0400 Subject: 3.0.2 tls web-server under k8s - external version 3.0.2 - internal version 5.0.2 for code change - no API change - https server is enabled when either of the following pairs are found in fs: 1. etc/cert/cert and etc/cert/pass (old behavior) 2. etc/cert/cert.p12 and etc/cert/p12.pass - added alternative - hide secrets when logging the config - changed Dockerfile to copy the whole etc/ folder that might contain etc/cert/* files - easier to test - replaced CRLF with LF in swagger-ui.js - no code change - unit tested Coverage summary Statements : 77.45% ( 910/1175 ) Branches : 53.7% ( 283/527 ) Functions : 79.9% ( 159/199 ) Lines : 77.85% ( 900/1156 ) Change-Id: I921e0d6ac9573f60fa98910f799f9d034b573542 Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-780 --- Dockerfile_UT | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Dockerfile_UT') diff --git a/Dockerfile_UT b/Dockerfile_UT index df4ddac..e6a6509 100644 --- a/Dockerfile_UT +++ b/Dockerfile_UT @@ -14,10 +14,11 @@ RUN mkdir -p ${APPDIR}/lib \ COPY *.js ${APPDIR}/ COPY *.json ${APPDIR}/ +COPY *.txt ${APPDIR}/ COPY *.yaml ${APPDIR}/ COPY ./lib/ ${APPDIR}/lib/ COPY ./tests/ ${APPDIR}/tests/ -COPY ./etc/log4js.json ${APPDIR}/etc/log4js.json +COPY ./etc/ ${APPDIR}/etc/ RUN npm install \ && chown -R ${APPUSER}:${APPUSER} ${APPDIR} \ @@ -25,7 +26,8 @@ RUN npm install \ && chmod 777 ${APPDIR}/tests \ && chmod 777 ${APPDIR}/log \ && chmod 777 ${APPDIR}/etc \ - && ls -la && ls -la ./tests + && pwd \ + && ls -laR -Inode_modules USER ${APPUSER} VOLUME ${APPDIR}/log -- cgit 1.2.3-korg