Rx3-Docker/php-apache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

- Fix error when APACHE_UID / APACHE_GID not provided,

Browse Source 
- Perform HTTPD initialisation even when not activated.
This commit is contained in:
Arnaud G. GIBERT 2025-12-01 20:25:49 +01:00
parent 353df70ee5
commit 8f5a7cc17d
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Dockerfile
View File

@ -24,39 +24,32 @@ ARG APACHE_PORT
#----------------------------------------------------------------------------------------------------------------------------
ARG HTTPD='#!/bin/bash \n\
\n\
usermod -u ${APACHE_UID} apache \n\
groupmod -g ${APACHE_GID} apache \n\
[[ "${APACHE_UID}" != "" ]] && usermod -u ${APACHE_UID} apache \n\
[[ "${APACHE_GID}" != "" ]] && groupmod -g ${APACHE_GID} apache \n\
\n\
chgrp apache /usr/bin/pwauth \n\
chmod u+s /usr/bin/pwauth \n\
\n\
chown -R apache:apache /var/log/httpd \n\
\n\
for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/sites.d/default_vhost.d/50-rx3.conf \n\
do \n\
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\
done \n\
\n\
[[ "${PHP_MEMORY_LIMIT}" == "" ]] && PHP_MEMORY_LIMIT="512M" \n\
[[ "${PHP_UPLOAD_LIMIT}" == "" ]] && PHP_UPLOAD_LIMIT="32M" \n\
\n\
sed -i -e "s/memory_limit = 128M/memory_limit = ${PHP_MEMORY_LIMIT}/" /etc/php.d/01_ressourcelimits.ini \n\
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\
\n\
# HTTPD enabled by default \n\
if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]] \n\
then \n\
file_enable /etc/supervisord.d/httpd.ini FALSE \n\
else \n\
file_enable /etc/supervisord.d/httpd.ini TRUE \n\
\n\
chown -R apache:apache /var/log/httpd \n\
\n\
for file in /etc/httpd/conf/httpd.conf /etc/httpd/conf/sites.d/default_vhost.d/50-rx3.conf \n\
do \n\
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" ${file} \n\
done \n\
\n\
if [[ "${PHP_MEMORY_LIMIT}" == "" ]] \n\
then \n\
PHP_MEMORY_LIMIT="512M" \n\
fi \n\
\n\
if [[ "${PHP_UPLOAD_LIMIT}" == "" ]] \n\
then \n\
PHP_UPLOAD_LIMIT="32M" \n\
fi \n\
\n\
sed -i -e "s/memory_limit = 128M/memory_limit = ${PHP_MEMORY_LIMIT}/" /etc/php.d/01_ressourcelimits.ini \n\
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'
#----------------------------------------------------------------------------------------------------------------------------

4
ReleaseNotes.txt
View File

@ -1,8 +1,10 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/11/29
Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01
------------------------------------------------------------------------------------------------------------------------------------
- Switch to new default_vhost.d layout,
- Fix error when APACHE_UID / APACHE_GID not provided,
- Perform HTTPD initialisation even when not activated,
- Use now rx3-docker/server:1.2.7-mga9 image,
- Rebuild for updates.