Update http server to conform E2E bulk pm tests

Issue-ID: INT-1815
Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Change-Id: Ie9fe76120256e2eed073656075834cd23893b325

diff --git a/httpserver/Dockerfile b/httpserver/Dockerfile
index 99acb9a..9b801d4 100644 (file)
--- a/httpserver/Dockerfile
+++ b/httpserver/Dockerfile
@@ -27,4 +27,8 @@ RUN chmod 644 /usr/local/apache2/conf/httpd.conf
 RUN chmod 644 /usr/lib/x86_64-linux-gnu/libjwt.so.1
 RUN chmod 644 /usr/local/apache2/modules/mod_authnz_jwt.so
 RUN touch /usr/local/apache2/htdocs/index.html
-CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+CMD if [ -f /etc/apache2/certs/cacert.pem  ]; then cp /etc/apache2/certs/cacert.pem /etc/apache2/certs/truststore.pem; fi \
+    && if [ -f /etc/apache2/certs/cert.pem  ]; then cp /etc/apache2/certs/cert.pem /etc/apache2/certs/keystore.pem; fi \
+    && chmod 777 /usr/local/apache2/htdocs \
+    && cp /usr/local/apache2/conf/upload.php /usr/local/apache2/htdocs/upload.php \
+    && /usr/sbin/apache2ctl -D FOREGROUND