diff options
| author |   Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> | 2021-03-23 06:35:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-03-23 06:35:33 +0000 |
| commit | 7dd294327d9c9ca2417e2998a32880f9044cdea0 (patch) | |
| tree | 2f0f422f7925e404ab3a2755865603dd7c40dc1b | |
| parent | 3803755a4903c7cbb028700353a5dd76a4564a2d (diff) | |
| parent | bfe96452b398eebdd05a426331634fad26183d45 (diff) | |
Merge "Update http server to conform E2E bulk pm tests"
| -rw-r--r-- | httpserver/Dockerfile | 6 |
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 |