From d2f1a2d8ae54e991816056cbf02b00176ab1e9c2 Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Tue, 9 Aug 2022 18:09:07 +0200 Subject: [PATCH] dockerfile --- Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3671e37..e5ab314 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,8 +39,8 @@ RUN chmod +x /install_composer.sh \ #RUN a2enmod rewrite && a2enmod ssl && a2enmod socache_shmcb RUN a2enmod rewrite && a2enmod ssl -COPY ./.docker/contao/httpd.conf /etc/apache2/sites-available/httpd.conf -COPY ./.docker/contao/httpd.conf /etc/apache2/conf-available/httpd.conf +COPY ./.docker/apache/httpd.conf /etc/apache2/sites-available/httpd.conf +COPY ./.docker/apache/httpd.conf /etc/apache2/conf-available/httpd.conf COPY ./cert/mycert.crt /etc/ssl/certs/mycert.crt COPY ./cert/mycert.key /etc/ssl/private/mycert.key @@ -49,8 +49,10 @@ RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-av RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf #RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/httpd.conf #RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/httpd.conf -#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-available/httpd.conf -#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/httpd.conf +#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-available/*.conf +#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-available/*.conf +#RUN sed -i '/SSLCertificateFile.*snakeoil\.pem/c\SSLCertificateFile \/etc\/ssl\/certs\/mycert.crt' /etc/apache2/sites-enabled/*.conf +#RUN sed -i '/SSLCertificateKeyFile.*snakeoil\.key/cSSLCertificateKeyFile /etc/ssl/private/mycert.key\' /etc/apache2/sites-enabled/*.conf RUN a2ensite httpd @@ -71,5 +73,7 @@ RUN rm -rf /var/www/html/contao/var/cache/* EXPOSE 80 EXPOSE 443 +#USER www-data + ENTRYPOINT ["/init.sh"] CMD ["apache2-foreground"] \ No newline at end of file