summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-22 13:01:01 +0100
committerKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-22 15:57:09 +0100
commit3885e88daf2e53cf3df552415795809bb02b8722 (patch)
tree1880db08f5a1ad127ee71f7f43960bb3eb227a5e
parentd8d37e4caeffc8ea0ea9c02b41c57f984ef4a113 (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: Ia19bc9157e87af32d14d7d62f4a40059f6df8d96
-rw-r--r--Dockerfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 4f727c7..7a6bdd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,4 +26,8 @@ RUN chmod 644 /usr/local/apache2/passwd/.htpasswd \
&& chmod 644 /usr/lib/x86_64-linux-gnu/libjwt.so.1 \
&& chmod 644 /usr/local/apache2/modules/mod_authnz_jwt.so \
&& 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