aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-22 12:39:15 +0100
committerKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-22 15:57:41 +0100
commitbfe96452b398eebdd05a426331634fad26183d45 (patch)
treedb5d91cbd4a54cb399fe8c22ef468d71b62436c4
parentb1961a04c191ebbc726de507d98c85966b7a6a71 (diff)
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
-rw-r--r--httpserver/Dockerfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/httpserver/Dockerfile b/httpserver/Dockerfile
index 99acb9a..9b801d4 100644
--- 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