Merge pull request #107 from thylong/feat/12factor-compliant-apache-config

Feat/12factor compliant apache config

Author: JulianPrieber

Dockerfile

@@ -38,43 +38,24 @@ RUN apk --no-cache --update \
     && mkdir /htdocs
 
 COPY linkstack /htdocs
+COPY configs/apache2/httpd.conf /etc/apache2/httpd.conf
+COPY configs/apache2/ssl.conf /etc/apache2/conf.d/ssl.conf
+COPY configs/php/php.ini /etc/php8.2/php.ini
+
+RUN chown apache:apache /etc/ssl/apache2/server.pem
+RUN chown apache:apache /etc/ssl/apache2/server.key
+
 RUN chown -R apache:apache /htdocs
 RUN find /htdocs -type d -print0 | xargs -0 chmod 0755
 RUN find /htdocs -type f -print0 | xargs -0 chmod 0644
 
 COPY --chmod=0755 docker-entrypoint.sh /usr/local/bin/
 
-HEALTHCHECK CMD curl -f http://localhost -A "HealthCheck" || exit 1
-
-# Enable compression
-RUN sed -i '/LoadModule mime_module/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/LoadModule deflate_module/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType text\/html/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType text\/plain/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType text\/xml/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType application\/javascript/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType text\/css/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType image\/svg\+xml/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType application\/x-font-ttf/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType font\/opentype/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType image\/jpeg/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType image\/png/s/^#//g' /etc/apache2/httpd.conf \
-    && sed -i '/AddOutputFilterByType image\/gif/s/^#//g' /etc/apache2/httpd.conf
-
-# Forward Apache access and error logs to Docker's log collector.
-# Optional last line adds extra verbosity with for example:
-# [ssl:info] [pid 33] [client 10.0.5.8:45542] AH01964: Connection to child 2 established (server your.domain:443)
-RUN ln -sf /dev/stdout /var/www/logs/access.log \
- && ln -sf /dev/stderr /var/www/logs/error.log \
- && ln -sf /dev/stderr /var/www/logs/ssl-access.log
-# && ln -sf /dev/stderr /var/www/logs/ssl-error.log
+USER apache:apache
 
-# Enable mod_deflate for text compression
-RUN sed -i 's/#LoadModule deflate_module/LoadModule deflate_module/' /etc/apache2/httpd.conf \
-    && sed -i 's/#LoadModule filter_module/LoadModule filter_module/' /etc/apache2/httpd.conf \
-    && echo 'AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/javascript application/json' >> /etc/apache2/httpd.conf
+HEALTHCHECK CMD curl -f http://localhost -A "HealthCheck" || exit 1
 
 # Set console entry path
 WORKDIR /htdocs
 
-CMD ["docker-entrypoint.sh"]
+CMD ["docker-entrypoint.sh"]