From f7c6fecf12ac700a249d90fa13d7be668a4da905 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Fri, 4 Oct 2024 17:43:55 +0200
Subject: [PATCH] - Now use rx3/server-mga9:1.1.3 image, - Add pwauth auth
 program, - Increase php params:     - memory_limit from 128M to 512M,     -
 upload_max_filesize from 16M to 32M,     - post_max_size from 8M to 32M, -
 Don't expose unneeded /var/www/html in compose file.

---
 .env             |  2 +-
 Dockerfile       | 26 ++++++++++++++++----------
 ReleaseNotes.txt | 14 ++++++++++++++
 compose.yaml     |  3 +++
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 0289566..8150450 100644
--- a/.env
+++ b/.env
@@ -17,7 +17,7 @@ IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
 
 IMG_NAME="php-apache-mga9"
 IMG_FULL_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
-IMG_VERSION="1.3.2"
+IMG_VERSION="1.3.3"
 IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
 IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
 
diff --git a/Dockerfile b/Dockerfile
index 94eb867..5e7c71d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG IMG_URL_PREFIX="rx3"
 
-FROM ${IMG_URL_PREFIX}/server-mga9:1.1.2
+FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
 
 ARG IMG_NAME
 ARG IMG_FULL_NAME
@@ -29,7 +29,7 @@ ARG HTTPD_CONF='RewriteEngine On
 #---------------------------------------------------------------------------------------------------
 ARG INFO_PHP='<?php                                                                              \n\
     phpinfo();                                                                                   \n\
-    phpinfo(INFO_MODULES);                                                                       \n\
+    phpinfo( INFO_MODULES);                                                                      \n\
 ?>'
 #---------------------------------------------------------------------------------------------------
 
@@ -44,7 +44,10 @@ chown -R apache:apache /var/log/httpd
 for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/conf.d/rx3.conf                           \n\
 do                                                                                               \n\
     sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file}                                      \n\
-done'
+done                                                                                             \n\
+                                                                                                 \n\
+chgrp           apache /usr/bin/pwauth                                                           \n\
+chmod    u+s           /usr/bin/pwauth'
 #---------------------------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------------------------
@@ -54,13 +57,16 @@ command=/usr/sbin/httpd -DFOREGROUND'
 
 
 
-RUN    urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer \
-    && echo -e   "${HTTPD_CONF}"   | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/conf.d/rx3.conf             \
-    && echo -e   "${INFO_PHP}"     | sed -e "s/\`/'/g" -e 's/ *$//' > /var/www/html/info.php                      \
-    && echo -e   "${HTTPD}"        | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/httpd                           \
-    && chmod a+x /etc/init.d/httpd                                                                                \
-    && ln   -s   /etc/init.d/httpd /etc/rcD.d/S30httpd                                                            \
-    && echo -e   "${HTTPD_INI}"    | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/httpd.ini
+RUN    urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \
+    && echo -e   "${HTTPD_CONF}"   | sed -e "s/\`/'/g" -e 's/ *$//'       > /etc/httpd/conf/conf.d/rx3.conf              \
+    && echo -e   "${INFO_PHP}"     | sed -e "s/\`/'/g" -e 's/ *$//'       > /var/www/html/info.php                       \
+    && echo -e   "${HTTPD}"        | sed -e "s/\`/'/g" -e 's/ *$//'       > /etc/init.d/httpd                            \
+    && chmod a+x /etc/init.d/httpd                                                                                       \
+    && ln   -s   /etc/init.d/httpd /etc/rcD.d/S30httpd                                                                   \
+    && echo -e   "${HTTPD_INI}"    | sed -e "s/\`/'/g" -e 's/ *$//' >       /etc/supervisord.d/httpd.ini                 \
+    && sed   -i -e "s/memory_limit = 128M/memory_limit = 512M/"             /etc/php.d/01_ressourcelimits.ini            \
+    && sed   -i -e "s/upload_max_filesize = 16M/upload_max_filesize = 32M/" /etc/php.d/01_fileuploads.ini                \
+    && sed   -i -e "s/post_max_size = 8M/post_max_size = 32M/"              /etc/php.d/01_datahandling.ini
 
 
 VOLUME /var/www/html
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index d3d138b..ebab039 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,3 +1,17 @@
+------------------------------------------------------------------------------------------------------------------------------------
+Rx3/PHP-Apache-Mga9 V 1.3.3 - A. GIBERT - 2024/10/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Now use rx3/server-mga9:1.1.3 image,
+- Add pwauth auth program,
+- Increase php params:
+    - memory_limit from 128M to 512M,
+    - upload_max_filesize from 16M to 32M,
+    - post_max_size from 8M to 32M,
+- Don't expose unneeded /var/www/html in compose file.
+
+
+
 ------------------------------------------------------------------------------------------------------------------------------------
 Rx3/PHP-Apache-Mga9 V 1.3.2 - A. GIBERT - 2024/08/28
 ------------------------------------------------------------------------------------------------------------------------------------
diff --git a/compose.yaml b/compose.yaml
index a99eccc..c067f0e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -26,6 +26,9 @@ services:
       APACHE_GID:      ${APACHE_GID}
       APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
       
+#    volumes:
+#      - ./var/www/html:/var/www/html
+      
     network_mode: bridge
     
     ports: