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

Compare commits

base: Rx3:master
Branches Tags
Rx3:master
Rx3:php-apache-mga9-1.3.3
Rx3:php-apache-mga9-1.3.2
Rx3:php-apache-mga9-1.3.1
Rx3:php-apache-mga9-1.3.0
Rx3:php-apache-mga9-1.2.0
Rx3:php-apache-mga9-1.1.0
Rx3:php-apache-mga9-1.0.0
..
compare: Rx3:php-apache-mga9-1.3.1
Branches Tags
Rx3:master
Rx3:php-apache-mga9-1.3.3
Rx3:php-apache-mga9-1.3.2
Rx3:php-apache-mga9-1.3.1
Rx3:php-apache-mga9-1.3.0
Rx3:php-apache-mga9-1.2.0
Rx3:php-apache-mga9-1.1.0
Rx3:php-apache-mga9-1.0.0

No commits in common. "master" and "php-apache-mga9-1.3.1" have entirely different histories.
master ... php-apache

5 changed files with 14 additions and 57 deletions
Show Stats Expand all files Collapse all files

8
env → .env
View File

@ -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.3"
IMG_VERSION="1.3.1"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@ -27,12 +27,6 @@ IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# 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

25
Dockerfile
View File

@ -3,7 +3,7 @@
ARG IMG_URL_PREFIX="rx3"
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.3
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.1
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\
?>'
#---------------------------------------------------------------------------------------------------
@ -41,13 +41,7 @@ groupmod -g ${APACHE_GID} apache
\n\
chown -R apache:apache /var/log/httpd \n\
\n\
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 \n\
\n\
chgrp apache /usr/bin/pwauth \n\
chmod u+s /usr/bin/pwauth'
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" /etc/httpd/conf/httpd.conf'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
@ -57,16 +51,13 @@ 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 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 \
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/ *$//' > /etc/httpd/conf/conf.d/rx3.conf \
&& echo -e "${INFO_PHP}" | sed -e 's/ *$//' > /var/www/html/info.php \
&& echo -e "${HTTPD}" | sed -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
&& echo -e "${HTTPD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/httpd.ini
VOLUME /var/www/html

2
ReadMe.txt
View File

@ -5,7 +5,7 @@ Welcome to Rx3/PHP-Apache-Mga9 docker image!
This is project aims to build a PHP + Apache + Mageia 9 docker image used by others Rx3 packaging projects.
Features:
- Curtently based on rx3/server-mga9:1.1.2 image,
- Curtently based on rx3/server-mga9:1.1.1 image,
- PostgreSQL & MySQL ready,
- PHPMailer installed,
- logrotate configured,

25
ReleaseNotes.txt
View File

@ -1,28 +1,3 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------
- Now use rx3/server-mga9:1.1.2 image,
- Fix Apache root document not updated in /etc/httpd/conf/conf.d/rx3.conf.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.3.1 - A. GIBERT - 2024/08/27
------------------------------------------------------------------------------------------------------------------------------------

7
compose.yaml
View File

@ -26,11 +26,8 @@ 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:${WEBAPP_SV_PORT}:9001"
- "127.0.0.1:${WEBAPP_PORT}:80"
- "127.0.0.1:9011:9001"
- "127.0.0.1:8080:80"