Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 AlkorZ3
|
97480f993b | ||
|
AlkorZ3
|
0861d07521 | ||
|
AlkorZ3
|
5a79b87b01 |
No files matched your search
+6
-5
@@ -43,9 +43,10 @@ done
|
||||
[[ "${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\
|
||||
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\
|
||||
sed -i -e "s/disable_functions =/disable_functions = ${PHP_DISABLED_FUNCTIONS}/" /etc/php.d/01_language.ini \n\
|
||||
\n\
|
||||
# HTTPD enabled by default \n\
|
||||
if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]] \n\
|
||||
@@ -134,7 +135,7 @@ ARG HTTPD_CONF='#---------------------------------------------------------------
|
||||
\n\
|
||||
\n\
|
||||
\n\
|
||||
RewriteEngine On \n\
|
||||
RewriteEngine On \n\
|
||||
\n\
|
||||
# Reverse Proxy Configuration \n\
|
||||
ProxyRequests Off \n\
|
||||
@@ -161,7 +162,7 @@ ARG INFO_PHP='<?php
|
||||
|
||||
|
||||
|
||||
RUN . /etc/profile.d/rx3.sh && isl_add ${IMG_URL} \
|
||||
RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} \
|
||||
&& 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 \
|
||||
&& sed -i -e "s%#LoadModule macro_module modules/mod_macro.so%LoadModule macro_module modules/mod_macro.so%" /etc/httpd/conf/modules.d/00_base.conf \
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ 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.3.0-mga9 image,
|
||||
- Curtently based on rx3-docker/server:1.4.0-mga9 image,
|
||||
- default_vhost.d layout support,
|
||||
- PostgreSQL & MySQL ready,
|
||||
- PHPMailer installed,
|
||||
|
||||
+34
-7
@@ -1,3 +1,30 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.7.2 - A. GIBERT - 2026/10/26
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add PHP_DISABLED_FUNCTIONS environment variable.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.7.1 - A. GIBERT - 2026/10/21
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Now use docker-tools-1.5.3,
|
||||
- Rebuild for updates (PHP 8.2.35).
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.7.0 - A. GIBERT - 2026/05/30
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Now use rx3-docker/server:1.4.0-mga9 image,
|
||||
- Now use docker-tools-1.5.2,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.6.3 - A. GIBERT - 2026/03/01
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
@@ -11,7 +38,7 @@ Rx3-Docker/PHP-Apache V 1.6.2 - A. GIBERT - 2026/02/16
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add ISL support,
|
||||
- Use now rx3-docker/server:1.3.0-mga9 image,
|
||||
- Now Use rx3-docker/server:1.3.0-mga9 image,
|
||||
- Fix rx3.conf file renaming bug.
|
||||
- Rebuild for updates.
|
||||
|
||||
@@ -34,7 +61,7 @@ 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,
|
||||
- Now use rx3-docker/server:1.2.7-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -43,7 +70,7 @@ Rx3-Docker/PHP-Apache V 1.6.0 - A. GIBERT - 2025/12/01
|
||||
Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/server:1.2.6-mga9 image,
|
||||
- Now use rx3-docker/server:1.2.6-mga9 image,
|
||||
- Rebuild for updates.
|
||||
|
||||
|
||||
@@ -52,7 +79,7 @@ Rx3-Docker/PHP-Apache V 1.5.4 - A. GIBERT - 2025/09/19
|
||||
Rx3-Docker/PHP-Apache V 1.5.3 - A. GIBERT - 2025/04/21
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Use now rx3-docker/server:1.2.2-mga9 image.
|
||||
- Now use rx3-docker/server:1.2.2-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -61,7 +88,7 @@ Rx3-Docker/PHP-Apache V 1.5.2 - A. GIBERT - 2025/03/08
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add PHP_MEMORY_LIMIT & PHP_UPLOAD_LIMIT environment variable,
|
||||
- Use now rx3-docker/server:1.2.1-mga9 image.
|
||||
- Now use rx3-docker/server:1.2.1-mga9 image.
|
||||
|
||||
|
||||
|
||||
@@ -88,7 +115,7 @@ Rx3-Docker/PHP-Apache V 1.4.0 - A. GIBERT - 2024/11/11
|
||||
- Move & Rename repo from Rx3/PHP-Apache-MGA9 to Rx3-Docker/PHP-Apache,
|
||||
- New version naming standard,
|
||||
- Now use docker_tools for .env building,
|
||||
- Use now rx3-docker/server:1.2.0-mga9 image,
|
||||
- Now use rx3-docker/server:1.2.0-mga9 image,
|
||||
- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
|
||||
|
||||
|
||||
@@ -105,7 +132,7 @@ Rx3/PHP-Apache-Mga9 V 1.3.3 - A. GIBERT - 2024/10/05
|
||||
- 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.
|
||||
- Now use docker_tools for .env building.
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -29,12 +29,14 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
SERVER_CROND_ENABLED: ${WA_SERVER_CROND_ENABLED}
|
||||
APACHE_UID: ${WA_USER_ID}
|
||||
APACHE_GID: ${WA_GROUP_ID}
|
||||
APACHE_DOC_ROOT: ${WA_DOC_ROOT}
|
||||
APACHE_HTTPD_ENABLED: ${WA_APACHE_HTTPD_ENABLED}
|
||||
PHP_MEMORY_LIMIT: ${WA_PHP_MEMORY_LIMIT}
|
||||
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
|
||||
PHP_DISABLED_FUNCTIONS: ${WA_PHP_DISABLED_FUNCTIONS}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}"]
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
# Global Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
||||
ORG_NAME="rx3-docker"
|
||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
@@ -17,6 +16,8 @@ ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||
#-------------------------------------------------------------------------------
|
||||
# Image Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
APPL_NAME=""
|
||||
HOST_NAME_PREFIX=""
|
||||
|
||||
PORT_ENV_OFFSET=0
|
||||
@@ -38,7 +39,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.6.3-mga9 ${ORG_URL_PREFIX} server 1.3.0-mga9 httpd - 8080 80 - - apache apache
|
||||
docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.7.2-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 httpd - 8080 80 - - apache apache
|
||||
|
||||
|
||||
|
||||
@@ -46,9 +47,14 @@ docker_service_add WA webapp ${ORG_URL_PREFIX}
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
SERVER_CROND_ENABLED="FALSE"
|
||||
WA_SERVER_CROND_ENABLED="FALSE"
|
||||
|
||||
WA_DOC_ROOT="/var/www/html"
|
||||
|
||||
WA_APACHE_HTTPD_ENABLED="TRUE"
|
||||
|
||||
WA_PHP_MEMORY_LIMIT="512M"
|
||||
WA_PHP_UPLOAD_LIMIT="32M"
|
||||
|
||||
#WA_PHP_DISABLED_FUNCTIONS="phpinfo"
|
||||
WA_PHP_DISABLED_FUNCTIONS=""
|
||||
Reference in new issue
Block a user