diff --git a/Dockerfile b/Dockerfile index b7b8b73..6a45c16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ARG APACHE_PORT -#--------------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------------------------------------- ARG HTTPD='#!/bin/bash \n\ \n\ usermod -u ${APACHE_UID} apache \n\ @@ -55,37 +55,38 @@ else sed -i -e "s/upload_max_filesize = 16M/upload_max_filesize = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_fileuploads.ini \n\ sed -i -e "s/post_max_size = 8M/post_max_size = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_datahandling.ini \n\ fi' -#--------------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------------------------------------- -#--------------------------------------------------------------------------------------------------- -ARG HTTPD_INI='[program:httpd] \n\ +#---------------------------------------------------------------------------------------------------------------------------- +ARG HTTPD_INI='[program:httpd] \n\ command=/usr/sbin/httpd -DFOREGROUND' -#--------------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------------------------------------- -#--------------------------------------------------------------------------------------------------- -ARG HTTPD_CONF='RewriteEngine On \n\ - \n\ - Options Includes Indexes FollowSymLinks \n\ - AllowOverride All \n\ - Require all granted \n\ +#---------------------------------------------------------------------------------------------------------------------------- +ARG HTTPD_CONF='RewriteEngine On \n\ + \n\ + Options Includes Indexes FollowSymLinks \n\ + AllowOverride All \n\ + Require all granted \n\ ' -#--------------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------------------------------------- -#--------------------------------------------------------------------------------------------------- -ARG INFO_PHP='' -#--------------------------------------------------------------------------------------------------- +#---------------------------------------------------------------------------------------------------------------------------- -RUN urpmi --force apache apache-mod_proxy apache-mod_proxy_html apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \ - && 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 \ - && echo -e "${HTTPD_CONF}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/httpd/conf/conf.d/rx3.conf \ +RUN urpmi.update -a \ + && urpmi --force apache apache-mod_proxy apache-mod_proxy_html apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer pwauth \ + && 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 \ + && 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 diff --git a/ReadMe.txt b/ReadMe.txt index 311b167..5379d1a 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -5,13 +5,13 @@ Welcome to Rx3-Docker/PHP-Apache docker image! This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects. Features: - - Curtently based on rx3-docker/server:1.2.1-mga9 image, + - Curtently based on rx3-docker/server:1.2.2-mga9 image, - PostgreSQL & MySQL ready, - PHPMailer installed, - logrotate configured, - Apache UID, GID & document root directory configurable, - mod_proxy + mod_proxy_html installed, - - HTTPD service enabled by default, + - HTTPD service enabled by default (APACHE_HTTPD_ENABLED), - PHP_MEMORY_LIMIT variable set to 512M by default, - PHP_UPLOAD_LIMIT variable set to 32M by defaylt. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index c1e6bac..880cd68 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.5.3 - A. GIBERT - 2025/04/21 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/server:1.2.2-mga9 image. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.5.2 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ @@ -11,7 +19,7 @@ Rx3-Docker/PHP-Apache V 1.5.2 - A. GIBERT - 2025/03/08 Rx3-Docker/PHP-Apache V 1.5.1 - A. GIBERT - 2024/12/31 ------------------------------------------------------------------------------------------------------------------------------------ -- Add Apache enabling via APACHE_HTTPD_ENABLE environment variable. +- Add Apache enabling via APACHE_HTTPD_ENABLED environment variable. diff --git a/compose.yaml b/compose.yaml index fd48ed0..f0aa327 100644 --- a/compose.yaml +++ b/compose.yaml @@ -42,7 +42,7 @@ services: retries: 3 volumes: - - ./${WA_LIB_EXT}:${WA_LIB_INT} +# - ./${WA_LIB_EXT}:${WA_LIB_INT} - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} - ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT} - ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT} diff --git a/env.dist b/env.dist index ae5f1d7..bb0580a 100644 --- a/env.dist +++ b/env.dist @@ -38,7 +38,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html" # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.5.2-mga9 ${ORG_URL_PREFIX} server 1.2.1-mga9 httpd - 8080 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.5.3-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 httpd - 8080 80 - - apache apache