dockerfile

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"]