From 158d564d1a5951ed05618eb51bbfdd75eafa74c9 Mon Sep 17 00:00:00 2001 From: Krzysztof Gajewski Date: Tue, 23 Mar 2021 16:11:41 +0100 Subject: Update http server to conform E2E bulk pm tests - update Issue-ID: INT-1815 Signed-off-by: Krzysztof Gajewski Change-Id: I28107452f1b543bd91c4d2a327b6b5f2cc356bde --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a6bdd5..89aeb5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,10 @@ RUN chmod 644 /usr/local/apache2/passwd/.htpasswd \ && chmod 644 /usr/local/apache2/conf/httpd.conf \ && 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 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 \ + && touch /usr/local/apache2/htdocs/index.html \ + && chmod 777 /usr/local/apache2/htdocs \ + && cp /usr/local/apache2/conf/upload.php /usr/local/apache2/htdocs/upload.php +CMD if [ -f /etc/apache2/certs/external/truststore.pem ]; then cp /etc/apache2/certs/external/truststore.pem /etc/apache2/certs/truststore.pem; fi \ + && if [ -f /etc/apache2/certs/external/keystore.pem ]; then cp /etc/apache2/certs/external/keystore.pem /etc/apache2/certs/keystore.pem; fi \ + && if [ -f /etc/apache2/certs/external/key.pem ]; then cp /etc/apache2/certs/external/key.pem /etc/apache2/certs/key.pem; fi \ && /usr/sbin/apache2ctl -D FOREGROUND -- cgit 1.2.3-korg