From 3c8b10f2420a92fbdf7e044fc795cd60a9fbc49f Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Sun, 7 Jun 2015 14:06:21 -0500 Subject: [PATCH] Update Dockerfile for debian:8.0 The latest import for the Dockerfile began having failures due to apache configuration changes in debian. This update fixes those failures and pins the base debian image to avoid these issues until we need to update debian itself. --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c8ef79921..8ff13a1e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:latest +FROM debian:8.0 MAINTAINER Alex Brandt EXPOSE 80 443 @@ -6,11 +6,11 @@ EXPOSE 80 443 RUN apt-get -qq update RUN apt-get install -qq apache2-mpm-event -RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default -RUN a2ensite default +RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/000-default.conf +RUN a2ensite 000-default -RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl -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 +RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|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 RUN a2ensite default-ssl