Compare commits
No commits in common. "master" and "php-apache-mga9-1.3.0" have entirely different histories.
master
...
php-apache
32
.env
Normal file
32
.env
Normal file
@ -0,0 +1,32 @@
|
||||
# Rx3 PHP Apache Mageia-9 Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Global Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
IMG_ORG="rx3"
|
||||
IMG_REGISTRY="docker.xor.rx3:5000"
|
||||
IMG_URL_PREFIX="${IMG_REGISTRY}/${IMG_ORG}"
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Image Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
IMG_ID="php-apache-mga9"
|
||||
IMG_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
|
||||
IMG_VERSION="1.3.0"
|
||||
IMG_URL="${IMG_URL_PREFIX}/${IMG_ID}:${IMG_VERSION}"
|
||||
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
APACHE_UID=980
|
||||
APACHE_GID=977
|
||||
APACHE_DOC_ROOT=/var/www/html
|
||||
122
Dockerfile
122
Dockerfile
@ -1,96 +1,68 @@
|
||||
# Rx3-Docker/PHP-Apache Docker Image
|
||||
# Rx3 PHP Apache Mageia-9 Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
ARG IMG_FROM_URL="rx3-docker/server:latest"
|
||||
ARG IMG_URL_PREFIX="rx3"
|
||||
|
||||
FROM ${IMG_FROM_URL}
|
||||
FROM ${IMG_URL_PREFIX}/server-mga9:1.1.0
|
||||
|
||||
ARG IMG_ID
|
||||
ARG IMG_NAME
|
||||
ARG IMG_NAME_FULL
|
||||
ARG IMG_VERSION
|
||||
ARG IMG_MAINTAINER
|
||||
|
||||
LABEL org.rx3.${IMG_NAME}.name=${IMG_NAME_FULL}
|
||||
LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION}
|
||||
LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER}
|
||||
LABEL org.rx3.${IMG_ID}.name=${IMG_NAME}
|
||||
LABEL org.rx3.${IMG_ID}.version=${IMG_VERSION}
|
||||
LABEL org.rx3.${IMG_ID}.maintainer=${IMG_MAINTAINER}
|
||||
LABEL maintainer=${IMG_MAINTAINER}
|
||||
|
||||
ARG APACHE_DOC_ROOT
|
||||
ARG APACHE_LOG_DIR
|
||||
ARG APACHE_PORT
|
||||
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD='#!/bin/bash \n\
|
||||
\n\
|
||||
usermod -u ${APACHE_UID} apache \n\
|
||||
groupmod -g ${APACHE_GID} apache \n\
|
||||
\n\
|
||||
chgrp apache /usr/bin/pwauth \n\
|
||||
chmod u+s /usr/bin/pwauth \n\
|
||||
\n\
|
||||
if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]] \n\
|
||||
then \n\
|
||||
mv /etc/supervisord.d/httpd.ini /etc/supervisord.d/httpd.ini.disabled \n\
|
||||
else \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\
|
||||
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'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_INI='[program:httpd] \n\
|
||||
command=/usr/sbin/httpd -DFOREGROUND'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_CONF='RewriteEngine On \n\
|
||||
<Directory /var/www/html> \n\
|
||||
Options Includes Indexes FollowSymLinks \n\
|
||||
AllowOverride All \n\
|
||||
Require all granted \n\
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_CONF='RewriteEngine On \n\
|
||||
<Directory /var/www/html> \n\
|
||||
Options Includes Indexes FollowSymLinks \n\
|
||||
AllowOverride All \n\
|
||||
Require all granted \n\
|
||||
</Directory>'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
ARG INFO_PHP='<?php \n\
|
||||
phpinfo(); \n\
|
||||
phpinfo( INFO_MODULES); \n\
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG INFO_PHP='<?php \n\
|
||||
phpinfo(); \n\
|
||||
phpinfo(INFO_MODULES); \n\
|
||||
?>'
|
||||
#----------------------------------------------------------------------------------------------------------------------------
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD='#!/bin/bash \n\
|
||||
\n\
|
||||
usermod -u ${APACHE_UID} apache \n\
|
||||
groupmod -g ${APACHE_GID} apache \n\
|
||||
\n\
|
||||
chown -R apache:apache /var/log/httpd \n\
|
||||
\n\
|
||||
sed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" /etc/httpd/conf/httpd.conf'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
ARG HTTPD_INI='[program:httpd] \n\
|
||||
command=/usr/sbin/httpd -DFOREGROUND'
|
||||
#---------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
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
|
||||
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 "#!/bin/bash\n\necho 'hello world!' >/tmp/toto\necho 'Test init completed.'" > /etc/init.d/test \
|
||||
&& chmod a+x /etc/init.d/test \
|
||||
&& ln -s /etc/init.d/test /etc/rcD.d/S20test \
|
||||
&& echo -e "${HTTPD_INI}" | sed -e 's/ *$//' > /etc/supervisord.d/httpd.ini
|
||||
|
||||
|
||||
VOLUME ${APACHE_DOC_ROOT}
|
||||
VOLUME ${APACHE_LOG_DIR}
|
||||
VOLUME /var/www/html
|
||||
|
||||
EXPOSE ${APACHE_PORT}
|
||||
EXPOSE 80
|
||||
|
||||
14
ReadMe.txt
14
ReadMe.txt
@ -1,19 +1,15 @@
|
||||
Welcome to Rx3-Docker/PHP-Apache docker image!
|
||||
Welcome to Rx3/PHP-Apache-Mga9 docker image!
|
||||
|
||||
|
||||
|
||||
This project aims to build a PHP + Apache docker image used by other Rx3 packaging projects.
|
||||
This is project aims to build a PHP + Apache + Mageia 9 docker image used by others Rx3 packaging projects.
|
||||
|
||||
Features:
|
||||
- Curtently based on rx3-docker/server:1.2.2-mga9 image,
|
||||
- Curtently based on rx3/server-mga9:1.1.0 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 (APACHE_HTTPD_ENABLED),
|
||||
- PHP_MEMORY_LIMIT variable set to 512M by default,
|
||||
- PHP_UPLOAD_LIMIT variable set to 32M by defaylt.
|
||||
- Apache UID, GID & document root directory configurable.
|
||||
|
||||
|
||||
Enjoy it!
|
||||
@ -22,4 +18,4 @@ Your Rx3 Team.
|
||||
|
||||
--
|
||||
arnaud@rx3.net
|
||||
https://git.rx3.org/gitea/rx3-docker/php-apache
|
||||
https://git.rx3.org/gitea/rx3/php-apache-mga9
|
||||
|
||||
@ -1,83 +1,3 @@
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add PHP_MEMORY_LIMIT & PHP_UPLOAD_LIMIT environment variable,
|
||||
- Use now rx3-docker/server:1.2.1-mga9 image.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.5.1 - A. GIBERT - 2024/12/31
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add Apache enabling via APACHE_HTTPD_ENABLED environment variable.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3-Docker/PHP-Apache V 1.5.0 - A. GIBERT - 2024/12/21
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Add apache mod proxy to support reverse proxy configuration.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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,
|
||||
- Add /var/log/init, /var/log/supervisor & var/log/httpd volumes.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
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
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Now use rx3/server-mga9:1.1.1 image,
|
||||
- Remove test init service,
|
||||
- Minor compose / dockerfile args & structure improvements.
|
||||
|
||||
|
||||
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
Rx3/PHP-Apache-Mga9 V 1.3.0 - A. GIBERT - 2024/08/26
|
||||
------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
53
compose.yaml
53
compose.yaml
@ -1,52 +1,33 @@
|
||||
# Rx3-Docker/PHP-Apache Docker Image
|
||||
# Rx3 PHP Apache Mageia-9 Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
name: ${HOST_NAME_PREFIX}
|
||||
name: ${IMG_ID}
|
||||
|
||||
services:
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
webapp:
|
||||
container_name: ${WA_HOST_NAME}
|
||||
hostname: ${WA_HOST_NAME}
|
||||
container_name: ${IMG_ID}
|
||||
|
||||
image: ${WA_IMG_URL}
|
||||
image: ${IMG_URL}
|
||||
|
||||
build:
|
||||
context: .
|
||||
args:
|
||||
IMG_NAME: ${WA_IMG_URL}
|
||||
IMG_NAME_FULL: ${WA_IMG_NAME_FULL}
|
||||
IMG_VERSION: ${WA_IMG_VERSION}
|
||||
IMG_MAINTAINER: ${WA_IMG_MAINTAINER}
|
||||
IMG_FROM_URL: ${WA_IMG_FROM_URL}
|
||||
- IMG_ID=${IMG_ID}
|
||||
- IMG_NAME=${IMG_NAME}
|
||||
- IMG_VERSION=${IMG_VERSION}
|
||||
- IMG_MAINTAINER=${IMG_MAINTAINER}
|
||||
- IMG_URL_PREFIX=${IMG_URL_PREFIX}
|
||||
|
||||
APACHE_DOC_ROOT: ${WA_DOC_ROOT}
|
||||
APACHE_LOG_DIR: ${WA_LOG_MAIN_INT}
|
||||
APACHE_PORT: ${WA_PORT_MAIN_INT}
|
||||
|
||||
restart: unless-stopped
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
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}
|
||||
APACHE_UID: ${APACHE_UID}
|
||||
APACHE_GID: ${APACHE_GID}
|
||||
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 3
|
||||
|
||||
volumes:
|
||||
# - ./${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}
|
||||
network_mode: bridge
|
||||
|
||||
ports:
|
||||
- "127.0.0.1:${WA_PORT_SV_EXT}:${WA_PORT_SV_INT}"
|
||||
- "127.0.0.1:${WA_PORT_MAIN_EXT}:${WA_PORT_MAIN_INT}"
|
||||
- "127.0.0.1:9010:9001"
|
||||
- "127.0.0.1:8080:80"
|
||||
|
||||
54
env.dist
54
env.dist
@ -1,54 +0,0 @@
|
||||
# Rx3-Docker/PHP-Apache Docker Image
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Global Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
||||
ORG_NAME="rx3-docker"
|
||||
ORG_REGISTRY="docker.xor.rx3:5000"
|
||||
ORG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
|
||||
|
||||
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Image Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
HOST_NAME_PREFIX=""
|
||||
|
||||
PORT_ENV_OFFSET=0
|
||||
|
||||
PORT_SV_INT=9001
|
||||
PORT_SV_OFFSET=1000
|
||||
|
||||
DOCKER_TOOLS_DEBUG=FALSE
|
||||
DOCKER_TOOLS_VOLUME=SINGLE
|
||||
#DOCKER_TOOLS_VOLUME=MIXED
|
||||
#DOCKER_TOOLS_VOLUME=MERGED
|
||||
#DOCKER_TOOLS_VOLUME=SPLITED
|
||||
DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html"
|
||||
|
||||
|
||||
|
||||
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+
|
||||
# | Variable | Service | Target Image | From Image | Module | Main Port | Admin Port | User | Group |
|
||||
# | 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.3-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 httpd - 8080 80 - - apache apache
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# User Settings
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
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"
|
||||
4
var/log/httpd/.gitignore
vendored
4
var/log/httpd/.gitignore
vendored
@ -1,4 +0,0 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
4
var/log/init/.gitignore
vendored
4
var/log/init/.gitignore
vendored
@ -1,4 +0,0 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
4
var/log/supervisor/.gitignore
vendored
4
var/log/supervisor/.gitignore
vendored
@ -1,4 +0,0 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
Loading…
Reference in New Issue
Block a user