- Use now rx3-docker/server:1.2.2-mga9 image.
This commit is contained in:
parent
0b2b46314d
commit
e63b7c338c
19
Dockerfile
19
Dockerfile
@ -21,7 +21,7 @@ ARG APACHE_PORT
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG HTTPD='#!/bin/bash \n\
|
ARG HTTPD='#!/bin/bash \n\
|
||||||
\n\
|
\n\
|
||||||
usermod -u ${APACHE_UID} apache \n\
|
usermod -u ${APACHE_UID} apache \n\
|
||||||
@ -55,32 +55,33 @@ 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/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\
|
sed -i -e "s/post_max_size = 8M/post_max_size = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_datahandling.ini \n\
|
||||||
fi'
|
fi'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG HTTPD_INI='[program:httpd] \n\
|
ARG HTTPD_INI='[program:httpd] \n\
|
||||||
command=/usr/sbin/httpd -DFOREGROUND'
|
command=/usr/sbin/httpd -DFOREGROUND'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG HTTPD_CONF='RewriteEngine On \n\
|
ARG HTTPD_CONF='RewriteEngine On \n\
|
||||||
<Directory /var/www/html> \n\
|
<Directory /var/www/html> \n\
|
||||||
Options Includes Indexes FollowSymLinks \n\
|
Options Includes Indexes FollowSymLinks \n\
|
||||||
AllowOverride All \n\
|
AllowOverride All \n\
|
||||||
Require all granted \n\
|
Require all granted \n\
|
||||||
</Directory>'
|
</Directory>'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
ARG INFO_PHP='<?php \n\
|
ARG INFO_PHP='<?php \n\
|
||||||
phpinfo(); \n\
|
phpinfo(); \n\
|
||||||
phpinfo( INFO_MODULES); \n\
|
phpinfo( INFO_MODULES); \n\
|
||||||
?>'
|
?>'
|
||||||
#---------------------------------------------------------------------------------------------------
|
#----------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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 \
|
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 \
|
&& echo -e "${HTTPD}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/httpd \
|
||||||
&& chmod a+x /etc/init.d/httpd \
|
&& chmod a+x /etc/init.d/httpd \
|
||||||
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
|
&& ln -s /etc/init.d/httpd /etc/rcD.d/S30httpd \
|
||||||
|
@ -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.
|
This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects.
|
||||||
|
|
||||||
Features:
|
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,
|
- PostgreSQL & MySQL ready,
|
||||||
- PHPMailer installed,
|
- PHPMailer installed,
|
||||||
- logrotate configured,
|
- logrotate configured,
|
||||||
- Apache UID, GID & document root directory configurable,
|
- Apache UID, GID & document root directory configurable,
|
||||||
- mod_proxy + mod_proxy_html installed,
|
- 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_MEMORY_LIMIT variable set to 512M by default,
|
||||||
- PHP_UPLOAD_LIMIT variable set to 32M by defaylt.
|
- PHP_UPLOAD_LIMIT variable set to 32M by defaylt.
|
||||||
|
|
||||||
|
@ -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
|
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
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ services:
|
|||||||
retries: 3
|
retries: 3
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./${WA_LIB_EXT}:${WA_LIB_INT}
|
# - ./${WA_LIB_EXT}:${WA_LIB_INT}
|
||||||
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}
|
||||||
- ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT}
|
- ./${WA_LOG_SV_EXT}:${WA_LOG_SV_INT}
|
||||||
- ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT}
|
- ./${WA_LOG_MAIN_EXT}:${WA_LOG_MAIN_INT}
|
||||||
|
2
env.dist
2
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 |
|
# | 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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user