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='' #--------------------------------------------------------------------------------------------------- @@ -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..8906b9b 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,19 @@ +------------------------------------------------------------------------------------------------------------------------------------ +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, +- Variabilization of external server ports in env & compose file, +- Use now docker_tools for .env building. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/PHP-Apache-Mga9 V 1.3.2 - A. GIBERT - 2024/08/28 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index a99eccc..4f1793b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -26,8 +26,11 @@ services: APACHE_GID: ${APACHE_GID} APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} +# volumes: +# - ./var/www/html:/var/www/html + network_mode: bridge ports: - - "127.0.0.1:9011:9001" - - "127.0.0.1:8080:80" + - "127.0.0.1:${WEBAPP_SV_PORT}:9001" + - "127.0.0.1:${WEBAPP_PORT}:80" diff --git a/.env b/env similarity index 86% rename from .env rename to env index 0289566..88ad546 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" ' @@ -27,6 +27,12 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" ' # User Settings #------------------------------------------------------------------------------- +ENV_PORT_OFFSET=0 +SV_PORT_OFFSET=1000 + +WEBAPP_PORT=$(( 8080 + ${ENV_PORT_OFFSET})) +WEBAPP_SV_PORT=$(( ${WEBAPP_PORT} + ${SV_PORT_OFFSET})) + APACHE_UID=980 APACHE_GID=977 APACHE_DOC_ROOT=/var/www/html