From 7ea26890fd3d3398873e16bd62dea4b5c7f269a3 Mon Sep 17 00:00:00 2001 From: Lucas dos Santos Abreu Date: Sun, 16 Jan 2022 11:24:37 -0300 Subject: [PATCH 1/4] feat: apache --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b64e82..9472b34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0 +FROM php:8.0-apache # keep ordered alphabetically to reduce diffs RUN apt update && apt install -y \ From f27fa471c374d9df2c1b3b96faf834f81243d13d Mon Sep 17 00:00:00 2001 From: Lucas dos Santos Abreu Date: Sun, 16 Jan 2022 11:44:02 -0300 Subject: [PATCH 2/4] feat: better logs and port --- Dockerfile | 3 +++ logs.conf | 7 +++++++ ports.conf | 3 +++ 3 files changed, 13 insertions(+) create mode 100644 logs.conf create mode 100644 ports.conf diff --git a/Dockerfile b/Dockerfile index 9472b34..c136e15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,4 +38,7 @@ RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && locale-gen \ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer ENV COMPOSER_ALLOW_SUPERUSER=1 +COPY ports.conf logs.conf /etc/apache2/conf-enabled/ +RUN a2enmod rewrite unique_id + USER www-data:www-data diff --git a/logs.conf b/logs.conf new file mode 100644 index 0000000..6a3cbdd --- /dev/null +++ b/logs.conf @@ -0,0 +1,7 @@ +ErrorLogFormat "[uid:%{UNIQUE_ID}e] %a [ip:%a] [remote-ip:%{X-Forwarded-For}i] [%{cu}t] \"%{REQUEST_METHOD}e %{REQUEST_URI}e\" %M" +LogFormat "[uid:%{UNIQUE_ID}e] %a [ip:%h] [remote-ip:%{X-Forwarded-For}i] [%{%Y-%m-%d %H:%M:%S}t] \"%r\" %>s %b, referer: \"%{Referer}i\", user-agent: \"%{User-agent}i\"" vhost_combined +LogFormat "[uid:%{UNIQUE_ID}e] %a [ip:%h] [remote-ip:%{X-Forwarded-For}i] [%{%Y-%m-%d %H:%M:%S}t] \"%r\" %>s %b, referer: \"%{Referer}i\", user-agent: \"%{User-agent}i\"" combined + +LogLevel warn + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/ports.conf b/ports.conf new file mode 100644 index 0000000..2fc834f --- /dev/null +++ b/ports.conf @@ -0,0 +1,3 @@ +Listen 8080 + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet From 64d8fb8b72f2445ebf2eece7b0208d33f117b58a Mon Sep 17 00:00:00 2001 From: Lucas dos Santos Abreu Date: Sun, 16 Jan 2022 11:46:33 -0300 Subject: [PATCH 3/4] feat: expose --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c136e15..8a69cba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,5 +40,6 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 COPY ports.conf logs.conf /etc/apache2/conf-enabled/ RUN a2enmod rewrite unique_id +EXPOSE 8080 USER www-data:www-data From eaaf3f1723d90bb2064e32049b1b765d46a6d805 Mon Sep 17 00:00:00 2001 From: Lucas dos Santos Abreu Date: Sun, 16 Jan 2022 12:06:14 -0300 Subject: [PATCH 4/4] fix: mod headers --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a69cba..f380b89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer ENV COMPOSER_ALLOW_SUPERUSER=1 COPY ports.conf logs.conf /etc/apache2/conf-enabled/ -RUN a2enmod rewrite unique_id +RUN a2enmod rewrite unique_id headers EXPOSE 8080 USER www-data:www-data