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

Compare commits

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

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

9 changed files with 46 additions and 227 deletions
Show Stats Expand all files Collapse all files

9
.env Normal file
View File

@ -0,0 +1,9 @@
IMG_ID="php-apache-mga9"
IMG_NAME="Rx3 PHP Apache Mageia-9 Docker Image"
IMG_VERSION="1.2.0"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
# To be configured
APACHE_UID=980
APACHE_GID=977
APACHE_DOC_ROOT=/var/www/html

80
Dockerfile
View File

@ -1,79 +1,27 @@
# Rx3-Docker/PHP-Apache Docker Image
# Rx3 PHP Apache Mageia-9 Docker Image
#-------------------------------------------------------------------------------
ARG IMG_FROM_URL="rx3-docker/server:latest"
FROM ${IMG_FROM_URL}
FROM docker.xor.rx3:5000/rx3/base-mga9:1.2.1
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
RUN urpmi --force apache apache-mod_php php-cli php-pgsql php-mysqli php-pdo_pgsql php-pdo_mysql php-phpmailer \
&& echo -e "RewriteEngine On\n<Directory /var/www/html>\n Options Includes Indexes FollowSymLinks\n AllowOverride All\n Require all granted\n</Directory>" >/etc/httpd/conf/conf.d/rx3.conf \
&& echo -e "<?php\n phpinfo();\n phpinfo(INFO_MODULES);\n?>\n" >/var/www/html/info.php \
&& echo -e '#!/bin/bash\n\nusermod -u ${APACHE_UID} apache\ngroupmod -g ${APACHE_GID} apache\n\nchown -R apache:apache /var/log/httpd\n\nsed -i -e "s%/var/www/html%${APACHE_DOC_ROOT}%" /etc/httpd/conf/httpd.conf\n\n/usr/sbin/httpd -DFOREGROUND' > /usr/local/sbin/apache_init \
&& chmod a+x /usr/local/sbin/apache_init
VOLUME /var/www/html
#---------------------------------------------------------------------------------------------------
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\
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'
#---------------------------------------------------------------------------------------------------
EXPOSE 80
#---------------------------------------------------------------------------------------------------
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\
</Directory>'
#---------------------------------------------------------------------------------------------------
#---------------------------------------------------------------------------------------------------
ARG INFO_PHP='<?php \n\
phpinfo(); \n\
phpinfo( INFO_MODULES); \n\
?>'
#---------------------------------------------------------------------------------------------------
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}" | 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 \
&& 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
VOLUME ${APACHE_DOC_ROOT}
VOLUME ${APACHE_LOG_DIR}
EXPOSE ${APACHE_PORT}
ENTRYPOINT ["/usr/local/sbin/apache_init"]

9
ReadMe.txt
View File

@ -1,14 +1,13 @@
Welcome to Rx3-Docker/PHP-Apache docker image!
Welcome to php-apache-mga9 docker image!
This project aims to build a PHP + Apache docker image used by others 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.0-mga9 image,
- Curtently based on base-mga9:1.2.1 image,
- PostgreSQL & MySQL ready,
- PHPMailer installed,
- logrotate configured,
- Apache UID, GID & document root directory configurable.
@ -18,4 +17,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

62
ReleaseNotes.txt
View File

@ -1,61 +1,5 @@
------------------------------------------------------------------------------------------------------------------------------------
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
------------------------------------------------------------------------------------------------------------------------------------
- Now use rx3/server-mga9:1.1.0 image,
- supervisor & logrotate configured.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/24
PHP-Apache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
- Add and use APACHE_DOC_ROOT environment variable,
@ -65,7 +9,7 @@ Rx3/PHP-Apache-Mga9 V 1.2.0 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/24
PHP-Apache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
- Add PHP PDO PostgreSQL & MySQL modules,
@ -74,7 +18,7 @@ Rx3/PHP-Apache-Mga9 V 1.1.0 - A. GIBERT - 2024/08/24
------------------------------------------------------------------------------------------------------------------------------------
Rx3/PHP-Apache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
PHP-Apache-Mga9 V 1.0.0 - A. GIBERT - 2024/08/22
------------------------------------------------------------------------------------------------------------------------------------
- Initial release,

50
compose.yaml
View File

@ -1,48 +1,30 @@
# Rx3-Docker/PHP-Apache Docker Image
# Rx3 PHP Apache Mageia-9 Docker Image
#-------------------------------------------------------------------------------
name: ${IMG_NAME}
name: ${IMG_ID}
services:
webapp:
container_name: ${IMG_NAME}
hostname: ${IMG_NAME}
image: ${IMG_URL}
container_name: ${IMG_ID}
image: docker.xor.rx3:5000/rx3/${IMG_ID}:${IMG_VERSION}
build:
context: .
context: .
args:
IMG_NAME: ${IMG_NAME}
IMG_NAME_FULL: ${IMG_NAME_FULL}
IMG_VERSION: ${IMG_VERSION}
IMG_MAINTAINER: ${IMG_MAINTAINER}
IMG_FROM_URL: ${IMG_FROM_URL}
- IMG_ID=${IMG_ID}
- IMG_NAME=${IMG_NAME}
- IMG_VERSION=${IMG_VERSION}
- IMG_MAINTAINER=${IMG_MAINTAINER}
APACHE_DOC_ROOT: ${WEBAPP_DOC_ROOT}
APACHE_LOG_DIR: ${WEBAPP_LOG_HTTPD_DIR}
APACHE_PORT: ${WEBAPP_PORT_MAIN_INT}
restart: unless-stopped
restart: unless-stopped
environment:
APACHE_UID: ${APACHE_UID}
APACHE_GID: ${APACHE_GID}
APACHE_DOC_ROOT: ${WEBAPP_DOC_ROOT}
APACHE_UID: ${APACHE_UID}
APACHE_GID: ${APACHE_GID}
APACHE_DOC_ROOT: ${APACHE_DOC_ROOT}
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${WEBAPP_PORT_MAIN_INT}"]
interval: 10s
timeout: 3s
retries: 3
volumes:
# - ./var/www/html:${WEBAPP_DOC_ROOT}
- ./var/log/init:${WEBAPP_LOG_INIT_DIR}
- ./var/log/supervisor:${WEBAPP_LOG_SV_DIR}
- ./var/log/httpd:${WEBAPP_LOG_HTTPD_DIR}
network_mode: bridge
ports:
- "127.0.0.1:${WEBAPP_PORT_SV_EXT}:${WEBAPP_PORT_SV_INT}"
- "127.0.0.1:${WEBAPP_PORT_MAIN_EXT}:${WEBAPP_PORT_MAIN_INT}"
- "127.0.0.1:8080:80"

51
env.dist
View File

@ -1,51 +0,0 @@
# Rx3-Docker/PHP-Apache Docker Image
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
# Global Settings
#-------------------------------------------------------------------------------
ORG_NAME="rx3-docker"
ORG_REGISTRY="docker.xor.rx3:5000"
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
#-------------------------------------------------------------------------------
# Image Settings
#-------------------------------------------------------------------------------
IMG_NAME="php-apache"
IMG_NAME_FULL="Rx3-Docker/PHP-Apache Docker Image"
IMG_VERSION="1.4.0-mga9"
IMG_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
IMG_URL_PREFIX="${ORG_URL_PREFIX}"
IMG_URL="${IMG_URL_PREFIX}/${IMG_NAME}:${IMG_VERSION}"
IMG_FROM_URL="${ORG_URL_PREFIX}/server:1.2.0-mga9"
#-------------------------------------------------------------------------------
# User Settings
#-------------------------------------------------------------------------------
ENV_PORT_OFFSET=0
SV_PORT_OFFSET=1000
WEBAPP_PORT_MAIN_EXT=$(( 8080 + ${ENV_PORT_OFFSET}))
WEBAPP_PORT_MAIN_INT=80
WEBAPP_PORT_SV_EXT=$(( ${WEBAPP_PORT_MAIN_EXT} + ${SV_PORT_OFFSET}))
WEBAPP_PORT_SV_INT=9001
WEBAPP_LOG_INIT_DIR="/var/log/init"
WEBAPP_LOG_SV_DIR="/var/log/supervisor"
WEBAPP_LOG_HTTPD_DIR="/var/log/httpd"
WEBAPP_DOC_ROOT="/var/www/html"
APACHE_UID=980
APACHE_GID=977

4
var/log/httpd/.gitignore vendored
View File

@ -1,4 +0,0 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

4
var/log/init/.gitignore vendored
View File

@ -1,4 +0,0 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore

4
var/log/supervisor/.gitignore vendored
View File

@ -1,4 +0,0 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore