From f7fdf1a4dee159e9cb6c542e7ef473562b90f183 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 09 May 2016 03:01:11 -0400 Subject: [PATCH] Merge pull request #5168 from piuma/patch-1 --- Dockerfile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bbab8ef..a28e857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,12 @@ EXPOSE 80 443 RUN apt-get -qq update -RUN apt-get install -qq apache2-mpm-event +RUN apt-get install -qq apache2-mpm-event ca-certificates -RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/000-default.conf +RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's@\(Log \+\)[^ ]\+@\1"|/bin/cat"@' -i /etc/apache2/sites-available/000-default.conf RUN a2ensite 000-default -RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl.conf +RUN sed -e 's|/var/www/html|/var/www/public_html|' -e 's@\(Log \+\)[^ ]\+@\1"|/bin/cat"@' -i /etc/apache2/sites-available/default-ssl.conf RUN sed -e '/SSLCertificateKeyFile/s|ssl-cert-snakeoil.key|ssl-cert.key|' -e '/SSLCertificateFile/s|ssl-cert-snakeoil.pem|ssl-cert.pem|' -i /etc/apache2/sites-available/default-ssl.conf RUN ln -snf ssl-cert-snakeoil.pem /etc/ssl/certs/ssl-cert.pem RUN ln -snf ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert.key -- Gitblit v1.9.1